diff --git a/index.php b/index.php index f0ed00232e..5dd93523e3 100644 --- a/index.php +++ b/index.php @@ -38,11 +38,10 @@ load_translation_table($lang); */ require_once("dba.php"); -$db = new dba($db_host, $db_user, $db_pass, $db_data, $install); - unset($db_host, $db_user, $db_pass, $db_data); - if(! $install) { +$db = new dba($db_host, $db_user, $db_pass, $db_data, $install); + unset($db_host, $db_user, $db_pass, $db_data); /** * Load configs from db. Overwrite configs from .htconfig.php diff --git a/view/de/messages.po b/view/de/messages.po index c67aebb768..87994b9801 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -4161,7 +4161,7 @@ msgstr "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zug #: ../../addon/facebook/facebook.php:665 msgid "The given API Key seems to work correctly." -msgstr "Der angegebene API Schlüssel scheint nicht korrekt zu funktionieren." +msgstr "Der angegebene API Schlüssel scheint korrekt zu funktionieren." #: ../../addon/facebook/facebook.php:667 msgid "" diff --git a/view/de/strings.php b/view/de/strings.php index ceff4109c5..a68a77a75c 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -924,7 +924,7 @@ $a->strings["Facebook Connector Settings"] = "Facebook-Verbindungseinstellungen" $a->strings["Facebook API Key"] = "Facebook API Schlüssel"; $a->strings["Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.

"] = "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.

"; $a->strings["Error: the given API Key seems to be incorrect (the application access token could not be retrieved)."] = "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zugriffstoken konnte nicht empfangen werden)."; -$a->strings["The given API Key seems to work correctly."] = "Der angegebene API Schlüssel scheint nicht korrekt zu funktionieren."; +$a->strings["The given API Key seems to work correctly."] = "Der angegebene API Schlüssel scheint korrekt zu funktionieren."; $a->strings["The correctness of the API Key could not be detected. Somthing strange's going on."] = "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange."; $a->strings["App-ID / API-Key"] = "App-ID / API-Key"; $a->strings["Application secret"] = "Anwendungs-Geheimnis"; diff --git a/view/theme/diabook-aerith/comment_item.tpl b/view/theme/diabook-aerith/comment_item.tpl index 4668b9ce39..6e455b7267 100644 --- a/view/theme/diabook-aerith/comment_item.tpl +++ b/view/theme/diabook-aerith/comment_item.tpl @@ -13,7 +13,9 @@
video - img + img + url + quote i u b diff --git a/view/theme/diabook-aerith/icons/bb-url.png b/view/theme/diabook-aerith/icons/bb-url.png new file mode 100644 index 0000000000..071fc18655 Binary files /dev/null and b/view/theme/diabook-aerith/icons/bb-url.png differ diff --git a/view/theme/diabook-aerith/icons/quote.png b/view/theme/diabook-aerith/icons/quote.png new file mode 100644 index 0000000000..a464f2859b Binary files /dev/null and b/view/theme/diabook-aerith/icons/quote.png differ diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css index 2089090f18..d1611d3261 100644 --- a/view/theme/diabook-aerith/style.css +++ b/view/theme/diabook-aerith/style.css @@ -82,6 +82,15 @@ #adminpage table tr:hover { background-color: #eeeeee; } #adminpage .selectall { text-align: right; } /* icons */ + +.icon.bb-url{ + background-image: url("../../../view/theme/diabook-aerith/icons/bb-url.png"); + float: right; + margin-top: 2px;} +.icon.quote{ + background-image: url("../../../view/theme/diabook-aerith/icons/quote.png"); + float: right; + margin-top: 2px;} .icon.bold{ background-image: url("../../../view/theme/diabook-aerith/icons/bold.png"); float: right; diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php index 1b26e47f83..c0537b010c 100755 --- a/view/theme/diabook-aerith/theme.php +++ b/view/theme/diabook-aerith/theme.php @@ -526,10 +526,16 @@ function insertFormatting(BBcode,id) { if (document.selection) { textarea.focus(); selected = document.selection.createRange(); + if (BBcode == "url"){ + selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]"; + } else selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]"; } else if (textarea.selectionStart || textarea.selectionStart == "0") { var start = textarea.selectionStart; var end = textarea.selectionEnd; + if (BBcode == "url"){ + textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); + } else textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); } return true; diff --git a/view/theme/diabook-blue/comment_item.tpl b/view/theme/diabook-blue/comment_item.tpl index 4668b9ce39..6e455b7267 100644 --- a/view/theme/diabook-blue/comment_item.tpl +++ b/view/theme/diabook-blue/comment_item.tpl @@ -13,7 +13,9 @@
video - img + img + url + quote i u b diff --git a/view/theme/diabook-blue/icons/bb-url.png b/view/theme/diabook-blue/icons/bb-url.png new file mode 100644 index 0000000000..071fc18655 Binary files /dev/null and b/view/theme/diabook-blue/icons/bb-url.png differ diff --git a/view/theme/diabook-blue/icons/quote.png b/view/theme/diabook-blue/icons/quote.png new file mode 100644 index 0000000000..a464f2859b Binary files /dev/null and b/view/theme/diabook-blue/icons/quote.png differ diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index 2f2369c46a..f4eebe0727 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -82,6 +82,14 @@ #adminpage table tr:hover { background-color: #eeeeee; } #adminpage .selectall { text-align: right; } /* icons */ +.icon.bb-url{ + background-image: url("../../../view/theme/diabook-blue/icons/bb-url.png"); + float: right; + margin-top: 2px;} +.icon.quote{ + background-image: url("../../../view/theme/diabook-blue/icons/quote.png"); + float: right; + margin-top: 2px;} .icon.bold{ background-image: url("../../../view/theme/diabook-blue/icons/bold.png"); float: right; diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php index f63f15fd97..435ecaf926 100755 --- a/view/theme/diabook-blue/theme.php +++ b/view/theme/diabook-blue/theme.php @@ -527,10 +527,16 @@ function insertFormatting(BBcode,id) { if (document.selection) { textarea.focus(); selected = document.selection.createRange(); + if (BBcode == "url"){ + selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]"; + } else selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]"; } else if (textarea.selectionStart || textarea.selectionStart == "0") { var start = textarea.selectionStart; var end = textarea.selectionEnd; + if (BBcode == "url"){ + textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); + } else textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); } return true; diff --git a/view/theme/diabook-red/comment_item.tpl b/view/theme/diabook-red/comment_item.tpl index 4668b9ce39..64e4fb802c 100644 --- a/view/theme/diabook-red/comment_item.tpl +++ b/view/theme/diabook-red/comment_item.tpl @@ -13,7 +13,9 @@
video - img + img + url + quote i u b diff --git a/view/theme/diabook-red/icons/bb-url.png b/view/theme/diabook-red/icons/bb-url.png new file mode 100644 index 0000000000..071fc18655 Binary files /dev/null and b/view/theme/diabook-red/icons/bb-url.png differ diff --git a/view/theme/diabook-red/icons/quote.png b/view/theme/diabook-red/icons/quote.png new file mode 100644 index 0000000000..a464f2859b Binary files /dev/null and b/view/theme/diabook-red/icons/quote.png differ diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index 0cf034a562..0acc12dd38 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -82,6 +82,14 @@ #adminpage table tr:hover { background-color: #eeeeee; } #adminpage .selectall { text-align: right; } /* icons */ +.icon.bb-url{ + background-image: url("../../../view/theme/diabook-red/icons/bb-url.png"); + float: right; + margin-top: 2px;} +.icon.quote{ + background-image: url("../../../view/theme/diabook-red/icons/quote.png"); + float: right; + margin-top: 2px;} .icon.bold{ background-image: url("../../../view/theme/diabook-red/icons/bold.png"); float: right; diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php index aec3ab95da..d1b932f1cd 100755 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -523,15 +523,21 @@ function insertFormatting(BBcode,id) { $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); openMenu("comment-edit-submit-wrapper-" + id); } - + textarea = document.getElementById("comment-edit-text-" +id); if (document.selection) { textarea.focus(); selected = document.selection.createRange(); + if (BBcode == "url"){ + selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]"; + } else selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]"; } else if (textarea.selectionStart || textarea.selectionStart == "0") { var start = textarea.selectionStart; var end = textarea.selectionEnd; + if (BBcode == "url"){ + textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); + } else textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); } return true; diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl index 4668b9ce39..535134256f 100644 --- a/view/theme/diabook/comment_item.tpl +++ b/view/theme/diabook/comment_item.tpl @@ -13,7 +13,9 @@
video - img + img + url + quote i u b diff --git a/view/theme/diabook/icons/bb-url.png b/view/theme/diabook/icons/bb-url.png new file mode 100644 index 0000000000..071fc18655 Binary files /dev/null and b/view/theme/diabook/icons/bb-url.png differ diff --git a/view/theme/diabook/icons/quote.png b/view/theme/diabook/icons/quote.png new file mode 100644 index 0000000000..a464f2859b Binary files /dev/null and b/view/theme/diabook/icons/quote.png differ diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 229076484f..7105ad0e37 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -83,6 +83,14 @@ #adminpage .selectall { text-align: right; } /* icons */ +.icon.bb-url{ + background-image: url("../../../view/theme/diabook/icons/bb-url.png"); + float: right; + margin-top: 2px;} +.icon.quote{ + background-image: url("../../../view/theme/diabook/icons/quote.png"); + float: right; + margin-top: 2px;} .icon.bold{ background-image: url("../../../view/theme/diabook/icons/bold.png"); float: right; diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index bf31c08ebb..4acb058e54 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -538,10 +538,16 @@ function insertFormatting(BBcode,id) { if (document.selection) { textarea.focus(); selected = document.selection.createRange(); + if (BBcode == "url"){ + selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]"; + } else selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]"; } else if (textarea.selectionStart || textarea.selectionStart == "0") { var start = textarea.selectionStart; var end = textarea.selectionEnd; + if (BBcode == "url"){ + textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); + } else textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); } return true; diff --git a/view/theme/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl index 340b7216cf..edabab6110 100644 --- a/view/theme/dispy-dark/communityhome.tpl +++ b/view/theme/dispy-dark/communityhome.tpl @@ -37,10 +37,8 @@ {{ endif }} -{{ if $lastusers_title }} -

PostIt to Friendica

+

'PostIt' to Friendica

Post to Friendica from anywhere by bookmarking this link.
-{{ endif }} diff --git a/view/theme/dispy-dark/default.php b/view/theme/dispy-dark/default.php index e74ec1a4f9..24df92a722 100644 --- a/view/theme/dispy-dark/default.php +++ b/view/theme/dispy-dark/default.php @@ -7,13 +7,18 @@ -