diff options
| -rw-r--r-- | addon/statusnet/statusnet.php | 2 | ||||
| -rw-r--r-- | boot.php | 10 | ||||
| -rw-r--r-- | database.sql | 1 | ||||
| -rw-r--r-- | images/smiley-brokenheart.gif | bin | 0 -> 616 bytes | |||
| -rw-r--r-- | mod/display.php | 2 | ||||
| -rw-r--r-- | mod/photos.php | 2 | ||||
| -rw-r--r-- | update.php | 4 | ||||
| -rw-r--r-- | view/de/msg-header.tpl | 14 | ||||
| -rw-r--r-- | view/de/strings.php | 49 | ||||
| -rw-r--r-- | view/en/msg-header.tpl | 14 | ||||
| -rw-r--r-- | view/fr/msg-header.tpl | 14 | ||||
| -rw-r--r-- | view/it/msg-header.tpl | 14 |
12 files changed, 86 insertions, 40 deletions
diff --git a/addon/statusnet/statusnet.php b/addon/statusnet/statusnet.php index bc47242fc..46ecdde99 100644 --- a/addon/statusnet/statusnet.php +++ b/addon/statusnet/statusnet.php @@ -133,7 +133,7 @@ function statusnet_settings(&$a,&$s) { $s .= '<input id="statusnet-consumerkey" type="text" name="statusnet-consumerkey" size="35" /><br />'; $s .= '<label id="statusnet-consumersecret-label" for="statusnet-consumersecret">'. t('OAuth Consumer Secret') .'</label>'; $s .= '<input id="statusnet-consumersecret" type="text" name="statusnet-consumersecret" size="35" /><br />'; - $s .= '<label id="statusnet-baseapi-label" for="statusnet-baseapi">'. t('Base API Path (remember the trailing /)') .'</label>'; + $s .= '<label id="statusnet-baseapi-label" for="statusnet-baseapi">'. t('Base API Path (remember the trailing /)') .'</label>'; $s .= '<input id="statusnet-baseapi" type="text" name="statusnet-baseapi" size="35" /><br />'; $s .= '</div><div class="clear"></div>'; $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="submit" class="settings-submit" value="' . t('Submit') . '" /></div>'; @@ -2,8 +2,8 @@ set_time_limit(0); -define ( 'BUILD_ID', 1038 ); -define ( 'FRIENDIKA_VERSION', '2.10.0906' ); +define ( 'BUILD_ID', 1039 ); +define ( 'FRIENDIKA_VERSION', '2.10.0907' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); define ( 'EOL', "<br />\r\n" ); @@ -1804,7 +1804,7 @@ function like_puller($a,$item,&$arr,$mode) { if((activity_match($item['verb'],$verb)) && ($item['id'] != $item['parent'])) { $url = $item['author-link']; - if(($item['network'] === 'dfrn') && (! $item['self']) && ($item['author-link'] == $item['url'])) { + if((local_user()) && (local_user() == $item['uid']) && ($item['network'] === 'dfrn') && (! $item['self']) && (link_compare($item['author-link'],$item['url']))) { $url = $a->get_baseurl() . '/redir/' . $item['contact-id']; $sparkle = ' class="sparkle" '; } @@ -1978,9 +1978,11 @@ function smilies($s) { $a = get_app(); return str_replace( - array( '<3', ':-)', ';-)', ':-(', ':(', ':-P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O'), + array( '<3', '</3', '<\\3', ':-)', ';-)', ':-(', ':(', ':-P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O'), array( '<img src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />', + '<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="</3" />', + '<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="<\\3" />', '<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":-)" />', '<img src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";-)" />', '<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":-(" />', diff --git a/database.sql b/database.sql index 55671db85..93e444b6b 100644 --- a/database.sql +++ b/database.sql @@ -181,6 +181,7 @@ CREATE TABLE IF NOT EXISTS `item` ( `object` text NOT NULL, `target-type` char(255) NOT NULL, `target` text NOT NULL, + `plink` char(255) NOT NULL, `resource-id` char(255) NOT NULL, `tag` mediumtext NOT NULL, `inform` mediumtext NOT NULL, diff --git a/images/smiley-brokenheart.gif b/images/smiley-brokenheart.gif Binary files differnew file mode 100644 index 000000000..79ca0c31b --- /dev/null +++ b/images/smiley-brokenheart.gif diff --git a/mod/display.php b/mod/display.php index 3215ae90a..b07e1aee5 100644 --- a/mod/display.php +++ b/mod/display.php @@ -153,7 +153,7 @@ function display_content(&$a) { } if($item['last-child']) { $comment = replace_macros($cmnt_tpl,array( - '$return_path' => $_SESSION['return_url'], + '$return_path' => '', // $_SESSION['return_url'], '$type' => 'wall-comment', '$id' => $item['item_id'], '$parent' => $item['parent'], diff --git a/mod/photos.php b/mod/photos.php index 9acde458d..a44eb5a5f 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1048,7 +1048,7 @@ function photos_content(&$a) { if($can_post || can_write_wall($a,$owner_uid)) { if($link_item['last-child']) { $o .= replace_macros($cmnt_tpl,array( - '$return_path' => $return_url, + '$return_path' => '', // $return_url, '$type' => 'wall-comment', '$id' => $link_item['id'], '$parent' => $link_item['id'], diff --git a/update.php b/update.php index 84eaebe18..131014d4a 100644 --- a/update.php +++ b/update.php @@ -370,3 +370,7 @@ function update_1037() { } +function update_1038() { + q("ALTER TABLE `item` ADD `plink` CHAR( 255 ) NOT NULL AFTER `target` "); +} + diff --git a/view/de/msg-header.tpl b/view/de/msg-header.tpl index 3d2567f62..174e6c985 100644 --- a/view/de/msg-header.tpl +++ b/view/de/msg-header.tpl @@ -6,14 +6,14 @@ tinyMCE.init({ theme : "advanced", mode : "specific_textareas", editor_selector: /(profile-jot-text|prvmail-text)/, - plugins : "bbcode", + plugins : "bbcode,paste", theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor", theme_advanced_buttons2 : "", theme_advanced_buttons3 : "", theme_advanced_toolbar_location : "top", theme_advanced_toolbar_align : "center", - theme_advanced_styles : "Code=codeStyle;Quote=quoteStyle", - content_css : "bbcode.css", + theme_advanced_blockformats : "blockquote,code", + paste_text_sticky : true, entity_encoding : "raw", add_unload_trigger : false, remove_linebreaks : false, @@ -44,8 +44,12 @@ tinyMCE.init({ $('#character-counter').addClass('red'); } $('#character-counter').text(text); - }); - } + }); + + ed.onInit.add(function(ed) { + ed.pasteAsPlainText = true; + }); + } }); </script> diff --git a/view/de/strings.php b/view/de/strings.php index bc31fab78..ef6892e8d 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -57,6 +57,18 @@ $a->strings['December'] = 'Dezember'; $a->strings['Birthdays this week:'] = 'Geburtstage diese Woche:'; $a->strings["\x28Adjusted for local time\x29"] = "\x28an die lokale Zeit angepasst\x29"; $a->strings['[today]'] = '[heute]'; +$a->strings['Unable to locate original post.'] = 'Unable to locate original post.'; +$a->strings['Empty post discarded.'] = 'Empty post discarded.'; +$a->strings['Wall Photos'] = 'Wall Photos'; +$a->strings[" commented on your item at "] = " commented on your item at "; +$a->strings[" posted on your profile wall at "] = " posted on your profile wall at "; +$a->strings['System error. Post not saved.'] = 'System error. Post not saved.'; +$a->strings['This message was sent to you by '] = 'This message was sent to you by '; +$a->strings[', a member of the Friendika social network.'] = ', a member of the Friendika social network.'; +$a->strings['You may visit them online at'] = 'You may visit them online at'; +$a->strings['Please contact the sender by replying to this post if you do not wish to receive these messages.'] = 'Please contact the sender by replying to this post if you do not wish to receive these messages.'; +$a->strings['posted an update.'] = 'posted an update.'; +$a->strings['Item not found.'] = 'Item not found.'; $a->strings["Invite Friends"] = "Freunde einladen"; $a->strings['Connect/Follow [profile address]'] = 'Kontaktiere/Folge [Profil Adresse]'; $a->strings['Example: bob@example.com, http://example.com/barbara'] = 'Beispiel: bob@example.com, http://example.com/barbara'; @@ -76,6 +88,9 @@ $a->strings['Contact not found.'] = 'Kontakt nicht gefunden.'; $a->strings['Mutual Friendship'] = 'Beidseitige Freundschaft'; $a->strings['is a fan of yours'] = 'ist ein Fan von dir'; $a->strings['you are a fan of'] = 'du bist Fan von'; +$a->strings['Never'] = 'Niemals'; +$a->strings["\x28Update was successful\x29"] = "\x28Aktualisierung war erfolgreich\x29"; +$a->strings["\x28Update was not successful\x29"] = "\x28Aktualisierung war nicht erfolgreich\x29"; $a->strings['Contact Editor'] = 'Kontakt Editor'; $a->strings['Visit $name\'s profile'] = 'Besuche das Profil von $name'; $a->strings['Block/Unblock contact'] = 'Kontakt blockieren/freischalten'; @@ -83,7 +98,6 @@ $a->strings['Ignore contact'] = 'Ignoriere den Kontakt'; $a->strings['Delete contact'] = 'Lösche den Kontakt'; $a->strings['Last updated: '] = 'Letzte Aktualisierung: '; $a->strings['Update public posts: '] = 'Aktualisierung öffentlicher Nachrichten: '; -$a->strings['Never'] = 'Niemals'; $a->strings['Update now'] = 'Jetzt aktualisieren'; $a->strings['Unblock this contact'] = 'Blockade dieses Kontakts aufheben'; $a->strings['Block this contact'] = 'Diesen Kontakt blockieren'; @@ -159,7 +173,6 @@ $a->strings['Your profile address:'] = 'Deine Profiladresse:'; $a->strings['Submit Request'] = 'Anfrage abschicken'; $a->strings['Cancel'] = 'Abbrechen'; $a->strings['Global Directory'] = 'Weltweites Verzeichnis'; -$a->strings['Item not found.'] = 'Eintrag nicht gefunden.'; $a->strings['Private Message'] = 'Private Nachricht'; $a->strings['This is you'] = 'Das bist du'; $a->strings['View $name\'s profile'] = 'Profile von $name'; @@ -215,16 +228,6 @@ $a->strings['Your message:'] = 'Deine Nachricht:'; $a->strings['Please join my social network on '] = 'Bitte trete meinem sozialen Netzwerk bei '; $a->strings['To accept this invitation, please visit:'] = 'Um diese Einladung anzunehmen beuche bitte:'; $a->strings['Once you have registered, please connect with me via my profile page at:'] = 'Sobald du registriert bist kontaktiere mich bitte auf meiner Profilseite:'; -$a->strings['Unable to locate original post.'] = 'Konnte das original Posting nicht finden.'; -$a->strings['Empty post discarded.'] = 'Leere Nachricht verworfen.'; -$a->strings['Wall Photos'] = 'Pinnwand Fotos'; -$a->strings[" commented on your item at "] = " kommentierte eines deiner Postings auf "; -$a->strings[" posted on your profile wall at "] = " schrieb an deine Profilwand auf "; -$a->strings['This message was sent to you by '] = 'This message was sent to you by '; -$a->strings[', a member of the Friendika social network.'] = ', a member of the Friendika social network.'; -$a->strings['You may visit them online at'] = 'You may visit them online at'; -$a->strings['Please contact the sender by replying to this post if you do not wish to receive these messages.'] = 'Please contact the sender by replying to this post if you do not wish to receive these messages.'; -$a->strings['posted an update.'] = 'posted an update.'; $a->strings['photo'] = 'Foto'; $a->strings['status'] = 'Status'; $a->strings['likes'] = 'mag das'; @@ -356,7 +359,9 @@ $a->strings['Register'] = 'Registrieren'; $a->strings['Please login.'] = 'Bitte melde dich an.'; $a->strings['Registration revoked for '] = 'Registration zurückgezogen '; $a->strings['Account approved.'] = 'Account freigegeben.'; -$a->strings['View in context'] = 'Im Kontext betrachten'; +$a->strings['Remove My Account'] = 'Remove My Account'; +$a->strings['This will completely remove your account. Once this has been done it is not recoverable.'] = 'This will completely remove your account. Once this has been done it is not recoverable.'; +$a->strings['Please enter your password for verification:'] = 'Please enter your password for verification:'; $a->strings['Passwords do not match. Password unchanged.'] = 'Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert.'; $a->strings['Empty passwords are not allowed. Password unchanged.'] = 'Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert.'; $a->strings['Password changed.'] = 'Passwort ändern.'; @@ -364,6 +369,7 @@ $a->strings['Password update failed. Please try again.'] = 'Aktualisierung des P $a->strings[' Please use a shorter name.'] = ' Bitte verwende einen kürzeren Namen.'; $a->strings[' Name too short.'] = ' Name ist zu kurz.'; $a->strings[' Not valid email.'] = ' Keine gültige EMail.'; +$a->strings[' Cannot change to that email.'] = ' Cannot change to that email.'; $a->strings['Settings updated.'] = 'Einstellungen aktualisiert.'; $a->strings['Plugin Settings'] = 'Plugin Einstellungen'; $a->strings['Account Settings'] = 'Account Einstellungen'; @@ -487,6 +493,23 @@ $a->strings['File has an invalid extension, it should be one of '] = 'Die Dateie $a->strings['Upload was cancelled, or server error encountered'] = 'Upload abgebrochen oder Serverfehler aufgetreten'; $a->strings['Randplace Settings'] = 'Randplace Settings'; $a->strings['Enable Randplace Plugin'] = 'Randplace Erweiterung aktivieren'; +$a->strings['No consumer key pair for StatusNet found. Register your Friendika 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 Friendika installation at your favorited StatusNet installation.'] = 'No consumer key pair for StatusNet found. Register your Friendika 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 Friendika 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'] = 'Log in with StatusNet'; +$a->strings['Copy the security code from StatusNet here'] = 'Copy the security code from StatusNet here'; +$a->strings['Currently connected to: '] = 'Currently connected to: '; +$a->strings['If enabled all your <strong>public</strong> postings will be posted to the associated StatusNet account as well.'] = 'If enabled all your <strong>public</strong> postings will be posted to the associated StatusNet account as well.'; +$a->strings['Send public postings to StatusNet'] = 'Send public postings to StatusNet'; +$a->strings['Clear OAuth configuration'] = 'Clear OAuth configuration'; +$a->strings['Twitter Posting Settings'] = 'Twitter Posting Settings'; +$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 Friendika instance the Twitter plugin 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 Friendika instance the Twitter plugin 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'] = 'Copy the PIN from Twitter here'; +$a->strings['If enabled all your <strong>public</strong> postings will be posted to the associated Twitter account as well.'] = 'If enabled all your <strong>public</strong> postings will be posted to the associated Twitter account as well.'; +$a->strings['Send public postings to Twitter'] = 'Send public postings to Twitter'; $a->strings['Africa/Abidjan'] = 'Africa/Abidjan'; $a->strings['Africa/Accra'] = 'Africa/Accra'; $a->strings['Africa/Addis_Ababa'] = 'Africa/Addis_Ababa'; diff --git a/view/en/msg-header.tpl b/view/en/msg-header.tpl index 3d2567f62..174e6c985 100644 --- a/view/en/msg-header.tpl +++ b/view/en/msg-header.tpl @@ -6,14 +6,14 @@ tinyMCE.init({ theme : "advanced", mode : "specific_textareas", editor_selector: /(profile-jot-text|prvmail-text)/, - plugins : "bbcode", + plugins : "bbcode,paste", theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor", theme_advanced_buttons2 : "", theme_advanced_buttons3 : "", theme_advanced_toolbar_location : "top", theme_advanced_toolbar_align : "center", - theme_advanced_styles : "Code=codeStyle;Quote=quoteStyle", - content_css : "bbcode.css", + theme_advanced_blockformats : "blockquote,code", + paste_text_sticky : true, entity_encoding : "raw", add_unload_trigger : false, remove_linebreaks : false, @@ -44,8 +44,12 @@ tinyMCE.init({ $('#character-counter').addClass('red'); } $('#character-counter').text(text); - }); - } + }); + + ed.onInit.add(function(ed) { + ed.pasteAsPlainText = true; + }); + } }); </script> diff --git a/view/fr/msg-header.tpl b/view/fr/msg-header.tpl index 3d2567f62..174e6c985 100644 --- a/view/fr/msg-header.tpl +++ b/view/fr/msg-header.tpl @@ -6,14 +6,14 @@ tinyMCE.init({ theme : "advanced", mode : "specific_textareas", editor_selector: /(profile-jot-text|prvmail-text)/, - plugins : "bbcode", + plugins : "bbcode,paste", theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor", theme_advanced_buttons2 : "", theme_advanced_buttons3 : "", theme_advanced_toolbar_location : "top", theme_advanced_toolbar_align : "center", - theme_advanced_styles : "Code=codeStyle;Quote=quoteStyle", - content_css : "bbcode.css", + theme_advanced_blockformats : "blockquote,code", + paste_text_sticky : true, entity_encoding : "raw", add_unload_trigger : false, remove_linebreaks : false, @@ -44,8 +44,12 @@ tinyMCE.init({ $('#character-counter').addClass('red'); } $('#character-counter').text(text); - }); - } + }); + + ed.onInit.add(function(ed) { + ed.pasteAsPlainText = true; + }); + } }); </script> diff --git a/view/it/msg-header.tpl b/view/it/msg-header.tpl index f6f437864..69e813ae2 100644 --- a/view/it/msg-header.tpl +++ b/view/it/msg-header.tpl @@ -6,14 +6,14 @@ tinyMCE.init({ theme : "advanced", mode : "specific_textareas", editor_selector: /(profile-jot-text|prvmail-text)/, - plugins : "bbcode", + plugins : "bbcode,paste", theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor", theme_advanced_buttons2 : "", theme_advanced_buttons3 : "", theme_advanced_toolbar_location : "top", theme_advanced_toolbar_align : "center", - theme_advanced_styles : "Code=codeStyle;Quote=quoteStyle", - content_css : "bbcode.css", + theme_advanced_blockformats : "blockquote,code", + paste_text_sticky : true, entity_encoding : "raw", add_unload_trigger : false, remove_linebreaks : false, @@ -44,8 +44,12 @@ tinyMCE.init({ $('#character-counter').addClass('red'); } $('#character-counter').text(text); - }); - } + }); + + ed.onInit.add(function(ed) { + ed.pasteAsPlainText = true; + }); + } }); </script> |
