Merge https://github.com/friendica/friendica into pull
0
include/config.php
Executable file → Normal file
0
include/dba.php
Executable file → Normal file
4
include/security.php
Normal file → Executable file
|
@ -326,7 +326,7 @@ function check_form_security_token($typename = '', $formname = 'form_security_to
|
|||
}
|
||||
|
||||
function check_form_security_std_err_msg() {
|
||||
return t('The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before subitting it.') . EOL;
|
||||
return t('The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it.') . EOL;
|
||||
}
|
||||
function check_form_security_token_redirectOnErr($err_redirect, $typename = '', $formname = 'form_security_token') {
|
||||
if (!check_form_security_token($typename, $formname)) {
|
||||
|
@ -344,4 +344,4 @@ function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'f
|
|||
header('HTTP/1.1 403 Forbidden');
|
||||
killme();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
0
js/main.js
Executable file → Normal file
|
@ -6639,7 +6639,7 @@ msgstr ""
|
|||
#: ../../include/security.php:329
|
||||
msgid ""
|
||||
"The form security token was not correct. This probably happened because the "
|
||||
"form has been opened for too long (>3 hours) before subitting it."
|
||||
"form has been opened for too long (>3 hours) before submitting it."
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/Contact.php:145 ../../include/conversation.php:813
|
||||
|
|
|
@ -6405,7 +6405,7 @@ msgstr "Willkommen zurück "
|
|||
#: ../../include/security.php:329
|
||||
msgid ""
|
||||
"The form security token was not correct. This probably happened because the "
|
||||
"form has been opened for too long (>3 hours) before subitting it."
|
||||
"form has been opened for too long (>3 hours) before submitting it."
|
||||
msgstr "Der Formular-Sicherheits-Token war nicht korrekt. Der Grund ist wahrscheinlich, dass das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."
|
||||
|
||||
#: ../../include/Contact.php:137 ../../include/conversation.php:813
|
||||
|
|
|
@ -1441,7 +1441,7 @@ $a->strings["image/photo"] = "Bild/Foto";
|
|||
$a->strings["Welcome "] = "Willkommen ";
|
||||
$a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch.";
|
||||
$a->strings["Welcome back "] = "Willkommen zurück ";
|
||||
$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before subitting it."] = "Der Formular-Sicherheits-Token war nicht korrekt. Der Grund ist wahrscheinlich, dass das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde.";
|
||||
$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Der Formular-Sicherheits-Token war nicht korrekt. Der Grund ist wahrscheinlich, dass das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde.";
|
||||
$a->strings["View status"] = "Status anzeigen";
|
||||
$a->strings["View profile"] = "Profil anzeigen";
|
||||
$a->strings["View photos"] = "Fotos ansehen";
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
|
||||
</div>
|
||||
<div class="comment-edit-photo-end"></div>
|
||||
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
|
||||
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea>
|
||||
<a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a>
|
||||
<a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a>
|
||||
<a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a>
|
||||
|
|
0
view/theme/diabook-aerith/communityhome.tpl
Executable file → Normal file
0
view/theme/diabook-aerith/contact_template.tpl
Executable file → Normal file
0
view/theme/diabook-aerith/directory_item.tpl
Executable file → Normal file
0
view/theme/diabook-aerith/fpostit/fpostit.js
Executable file → Normal file
0
view/theme/diabook-aerith/group_side.tpl
Executable file → Normal file
0
view/theme/diabook-aerith/icons/attach.png
Executable file → Normal file
Before (image error) Size: 1 KiB After (image error) Size: 1 KiB |
0
view/theme/diabook-aerith/icons/audio.png
Executable file → Normal file
Before (image error) Size: 762 B After (image error) Size: 762 B |
0
view/theme/diabook-aerith/icons/camera.png
Executable file → Normal file
Before (image error) Size: 685 B After (image error) Size: 685 B |
0
view/theme/diabook-aerith/icons/close_box.png
Executable file → Normal file
Before (image error) Size: 206 B After (image error) Size: 206 B |
0
view/theme/diabook-aerith/icons/drop.png
Executable file → Normal file
Before (image error) Size: 292 B After (image error) Size: 292 B |
0
view/theme/diabook-aerith/icons/file_as.png
Executable file → Normal file
Before (image error) Size: 352 B After (image error) Size: 352 B |
0
view/theme/diabook-aerith/icons/link.png
Executable file → Normal file
Before (image error) Size: 365 B After (image error) Size: 365 B |
0
view/theme/diabook-aerith/icons/lock.png
Executable file → Normal file
Before (image error) Size: 366 B After (image error) Size: 366 B |
0
view/theme/diabook-aerith/icons/lupe.png
Executable file → Normal file
Before (image error) Size: 697 B After (image error) Size: 697 B |
0
view/theme/diabook-aerith/icons/messages.png
Executable file → Normal file
Before (image error) Size: 901 B After (image error) Size: 901 B |
0
view/theme/diabook-aerith/icons/messages2.png
Executable file → Normal file
Before (image error) Size: 579 B After (image error) Size: 579 B |
0
view/theme/diabook-aerith/icons/messages3.png
Executable file → Normal file
Before (image error) Size: 579 B After (image error) Size: 579 B |
0
view/theme/diabook-aerith/icons/next.png
Executable file → Normal file
Before (image error) Size: 300 B After (image error) Size: 300 B |
0
view/theme/diabook-aerith/icons/notifications.png
Executable file → Normal file
Before (image error) Size: 1 KiB After (image error) Size: 1 KiB |
0
view/theme/diabook-aerith/icons/notifications3.png
Executable file → Normal file
Before (image error) Size: 754 B After (image error) Size: 754 B |
0
view/theme/diabook-aerith/icons/notify.png
Executable file → Normal file
Before (image error) Size: 1.1 KiB After (image error) Size: 1.1 KiB |
0
view/theme/diabook-aerith/icons/notify2.png
Executable file → Normal file
Before (image error) Size: 795 B After (image error) Size: 795 B |
0
view/theme/diabook-aerith/icons/notify3.png
Executable file → Normal file
Before (image error) Size: 795 B After (image error) Size: 795 B |
0
view/theme/diabook-aerith/icons/pencil.png
Executable file → Normal file
Before (image error) Size: 286 B After (image error) Size: 286 B |
0
view/theme/diabook-aerith/icons/photo-menu.jpg
Executable file → Normal file
Before (image error) Size: 459 B After (image error) Size: 459 B |
0
view/theme/diabook-aerith/icons/prev.png
Executable file → Normal file
Before (image error) Size: 336 B After (image error) Size: 336 B |
0
view/theme/diabook-aerith/icons/recycle.png
Executable file → Normal file
Before (image error) Size: 296 B After (image error) Size: 296 B |
0
view/theme/diabook-aerith/icons/remote.png
Executable file → Normal file
Before (image error) Size: 427 B After (image error) Size: 427 B |
0
view/theme/diabook-aerith/icons/scroll_top.png
Executable file → Normal file
Before (image error) Size: 296 B After (image error) Size: 296 B |
0
view/theme/diabook-aerith/icons/star.png
Executable file → Normal file
Before (image error) Size: 388 B After (image error) Size: 388 B |
0
view/theme/diabook-aerith/icons/starred.png
Executable file → Normal file
Before (image error) Size: 501 B After (image error) Size: 501 B |
0
view/theme/diabook-aerith/icons/tagged.png
Executable file → Normal file
Before (image error) Size: 353 B After (image error) Size: 353 B |
0
view/theme/diabook-aerith/icons/unlock.png
Executable file → Normal file
Before (image error) Size: 362 B After (image error) Size: 362 B |
0
view/theme/diabook-aerith/icons/unstarred.png
Executable file → Normal file
Before (image error) Size: 468 B After (image error) Size: 468 B |
0
view/theme/diabook-aerith/icons/video.png
Executable file → Normal file
Before (image error) Size: 472 B After (image error) Size: 472 B |
0
view/theme/diabook-aerith/icons/weblink.png
Executable file → Normal file
Before (image error) Size: 505 B After (image error) Size: 505 B |
0
view/theme/diabook-aerith/jot.tpl
Executable file → Normal file
46
view/theme/diabook-aerith/js/jquery.autogrow.textarea.js
Normal file
|
@ -0,0 +1,46 @@
|
|||
(function($) {
|
||||
|
||||
/*
|
||||
* Auto-growing textareas; technique ripped from Facebook
|
||||
*/
|
||||
$.fn.autogrow = function(options) {
|
||||
|
||||
this.filter('textarea').each(function() {
|
||||
|
||||
var $this = $(this),
|
||||
minHeight = $this.height(),
|
||||
lineHeight = $this.css('lineHeight');
|
||||
|
||||
var shadow = $('<div></div>').css({
|
||||
position: 'absolute',
|
||||
top: -10000,
|
||||
left: -10000,
|
||||
width: $(this).width(),
|
||||
fontSize: $this.css('fontSize'),
|
||||
fontFamily: $this.css('fontFamily'),
|
||||
lineHeight: $this.css('lineHeight'),
|
||||
resize: 'none'
|
||||
}).appendTo(document.body);
|
||||
|
||||
var update = function() {
|
||||
|
||||
var val = this.value.replace(/</g, '<')
|
||||
.replace(/>/g, '>')
|
||||
.replace(/&/g, '&')
|
||||
.replace(/\n/g, '<br/>');
|
||||
|
||||
shadow.html(val);
|
||||
$(this).css('height', Math.max(shadow.height() + 20, minHeight));
|
||||
}
|
||||
|
||||
$(this).change(update).keyup(update).keydown(update);
|
||||
|
||||
update.apply(this);
|
||||
|
||||
});
|
||||
|
||||
return this;
|
||||
|
||||
}
|
||||
|
||||
})(jQuery);
|
0
view/theme/diabook-aerith/mail_conv.tpl
Executable file → Normal file
0
view/theme/diabook-aerith/photo_view.tpl
Executable file → Normal file
0
view/theme/diabook-aerith/search_item.tpl
Executable file → Normal file
13
view/theme/diabook-aerith/theme.php
Executable file → Normal file
|
@ -292,6 +292,10 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip
|
|||
$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.ae.image.resize.js";
|
||||
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
|
||||
|
||||
//load jquery.autogrow-textarea.js
|
||||
$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/js/jquery.autogrow.textarea.js";
|
||||
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $autogrowJS);
|
||||
|
||||
//js scripts
|
||||
//comment-edit-wrapper on photo_view
|
||||
if ($a->argv[0].$a->argv[2] === "photos"."image"){
|
||||
|
@ -315,6 +319,15 @@ $a->page['htmlhead'] .= '
|
|||
});
|
||||
|
||||
</script>';
|
||||
|
||||
$a->page['htmlhead'] .= '
|
||||
|
||||
<script type="text/javascript">
|
||||
|
||||
function tautogrow(id){
|
||||
$("textarea#comment-edit-text-" +id).autogrow();
|
||||
};
|
||||
</script>';
|
||||
|
||||
$a->page['htmlhead'] .= '
|
||||
<script>
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
|
||||
</div>
|
||||
<div class="comment-edit-photo-end"></div>
|
||||
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
|
||||
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea>
|
||||
<a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a>
|
||||
<a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a>
|
||||
<a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a>
|
||||
|
|
0
view/theme/diabook-blue/communityhome.tpl
Executable file → Normal file
0
view/theme/diabook-blue/contact_template.tpl
Executable file → Normal file
0
view/theme/diabook-blue/directory_item.tpl
Executable file → Normal file
0
view/theme/diabook-blue/fpostit/fpostit.js
Executable file → Normal file
0
view/theme/diabook-blue/group_side.tpl
Executable file → Normal file
0
view/theme/diabook-blue/icons/attach.png
Executable file → Normal file
Before (image error) Size: 1 KiB After (image error) Size: 1 KiB |
0
view/theme/diabook-blue/icons/audio.png
Executable file → Normal file
Before (image error) Size: 762 B After (image error) Size: 762 B |
0
view/theme/diabook-blue/icons/camera.png
Executable file → Normal file
Before (image error) Size: 685 B After (image error) Size: 685 B |
0
view/theme/diabook-blue/icons/close_box.png
Executable file → Normal file
Before (image error) Size: 206 B After (image error) Size: 206 B |
0
view/theme/diabook-blue/icons/contacts2.png
Executable file → Normal file
Before (image error) Size: 549 B After (image error) Size: 549 B |
0
view/theme/diabook-blue/icons/drop.png
Executable file → Normal file
Before (image error) Size: 292 B After (image error) Size: 292 B |
0
view/theme/diabook-blue/icons/file_as.png
Executable file → Normal file
Before (image error) Size: 352 B After (image error) Size: 352 B |
0
view/theme/diabook-blue/icons/link.png
Executable file → Normal file
Before (image error) Size: 365 B After (image error) Size: 365 B |
0
view/theme/diabook-blue/icons/lock.png
Executable file → Normal file
Before (image error) Size: 366 B After (image error) Size: 366 B |
0
view/theme/diabook-blue/icons/lupe.png
Executable file → Normal file
Before (image error) Size: 697 B After (image error) Size: 697 B |
0
view/theme/diabook-blue/icons/messages.png
Executable file → Normal file
Before (image error) Size: 490 B After (image error) Size: 490 B |
0
view/theme/diabook-blue/icons/next.png
Executable file → Normal file
Before (image error) Size: 300 B After (image error) Size: 300 B |
0
view/theme/diabook-blue/icons/notifications.png
Executable file → Normal file
Before (image error) Size: 727 B After (image error) Size: 727 B |
0
view/theme/diabook-blue/icons/notify.png
Executable file → Normal file
Before (image error) Size: 608 B After (image error) Size: 608 B |
0
view/theme/diabook-blue/icons/pencil.png
Executable file → Normal file
Before (image error) Size: 286 B After (image error) Size: 286 B |
0
view/theme/diabook-blue/icons/prev.png
Executable file → Normal file
Before (image error) Size: 336 B After (image error) Size: 336 B |
0
view/theme/diabook-blue/icons/recycle.png
Executable file → Normal file
Before (image error) Size: 296 B After (image error) Size: 296 B |
0
view/theme/diabook-blue/icons/remote.png
Executable file → Normal file
Before (image error) Size: 427 B After (image error) Size: 427 B |
0
view/theme/diabook-blue/icons/scroll_top.png
Executable file → Normal file
Before (image error) Size: 296 B After (image error) Size: 296 B |
0
view/theme/diabook-blue/icons/star.png
Executable file → Normal file
Before (image error) Size: 388 B After (image error) Size: 388 B |
0
view/theme/diabook-blue/icons/starred.png
Executable file → Normal file
Before (image error) Size: 501 B After (image error) Size: 501 B |
0
view/theme/diabook-blue/icons/tagged.png
Executable file → Normal file
Before (image error) Size: 353 B After (image error) Size: 353 B |
0
view/theme/diabook-blue/icons/unlock.png
Executable file → Normal file
Before (image error) Size: 362 B After (image error) Size: 362 B |
0
view/theme/diabook-blue/icons/unstarred.png
Executable file → Normal file
Before (image error) Size: 468 B After (image error) Size: 468 B |
0
view/theme/diabook-blue/icons/video.png
Executable file → Normal file
Before (image error) Size: 472 B After (image error) Size: 472 B |
0
view/theme/diabook-blue/icons/weblink.png
Executable file → Normal file
Before (image error) Size: 505 B After (image error) Size: 505 B |
0
view/theme/diabook-blue/jot.tpl
Executable file → Normal file
46
view/theme/diabook-blue/js/jquery.autogrow.textarea.js
Normal file
|
@ -0,0 +1,46 @@
|
|||
(function($) {
|
||||
|
||||
/*
|
||||
* Auto-growing textareas; technique ripped from Facebook
|
||||
*/
|
||||
$.fn.autogrow = function(options) {
|
||||
|
||||
this.filter('textarea').each(function() {
|
||||
|
||||
var $this = $(this),
|
||||
minHeight = $this.height(),
|
||||
lineHeight = $this.css('lineHeight');
|
||||
|
||||
var shadow = $('<div></div>').css({
|
||||
position: 'absolute',
|
||||
top: -10000,
|
||||
left: -10000,
|
||||
width: $(this).width(),
|
||||
fontSize: $this.css('fontSize'),
|
||||
fontFamily: $this.css('fontFamily'),
|
||||
lineHeight: $this.css('lineHeight'),
|
||||
resize: 'none'
|
||||
}).appendTo(document.body);
|
||||
|
||||
var update = function() {
|
||||
|
||||
var val = this.value.replace(/</g, '<')
|
||||
.replace(/>/g, '>')
|
||||
.replace(/&/g, '&')
|
||||
.replace(/\n/g, '<br/>');
|
||||
|
||||
shadow.html(val);
|
||||
$(this).css('height', Math.max(shadow.height() + 20, minHeight));
|
||||
}
|
||||
|
||||
$(this).change(update).keyup(update).keydown(update);
|
||||
|
||||
update.apply(this);
|
||||
|
||||
});
|
||||
|
||||
return this;
|
||||
|
||||
}
|
||||
|
||||
})(jQuery);
|
0
view/theme/diabook-blue/mail_conv.tpl
Executable file → Normal file
0
view/theme/diabook-blue/photo_view.tpl
Executable file → Normal file
0
view/theme/diabook-blue/search_item.tpl
Executable file → Normal file
13
view/theme/diabook-blue/theme.php
Executable file → Normal file
|
@ -290,6 +290,10 @@ $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></scrip
|
|||
$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.ae.image.resize.js";
|
||||
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
|
||||
|
||||
//load jquery.autogrow-textarea.js
|
||||
$autogrowJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.autogrow.textarea.js";
|
||||
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $autogrowJS);
|
||||
|
||||
//js scripts
|
||||
//comment-edit-wrapper on photo_view
|
||||
if ($a->argv[0].$a->argv[2] === "photos"."image"){
|
||||
|
@ -314,6 +318,15 @@ $a->page['htmlhead'] .= '
|
|||
});
|
||||
|
||||
</script>';
|
||||
|
||||
$a->page['htmlhead'] .= '
|
||||
|
||||
<script type="text/javascript">
|
||||
|
||||
function tautogrow(id){
|
||||
$("textarea#comment-edit-text-" +id).autogrow();
|
||||
};
|
||||
</script>';
|
||||
|
||||
$a->page['htmlhead'] .= '
|
||||
<script>
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
|
||||
</div>
|
||||
<div class="comment-edit-photo-end"></div>
|
||||
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
|
||||
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea>
|
||||
<a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a>
|
||||
<a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a>
|
||||
<a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a>
|
||||
|
|
0
view/theme/diabook-red/communityhome.tpl
Executable file → Normal file
0
view/theme/diabook-red/contact_template.tpl
Executable file → Normal file
0
view/theme/diabook-red/directory_item.tpl
Executable file → Normal file
0
view/theme/diabook-red/fpostit/fpostit.js
Executable file → Normal file
0
view/theme/diabook-red/group_side.tpl
Executable file → Normal file
0
view/theme/diabook-red/icons/attach.png
Executable file → Normal file
Before (image error) Size: 1 KiB After (image error) Size: 1 KiB |
0
view/theme/diabook-red/icons/audio.png
Executable file → Normal file
Before (image error) Size: 762 B After (image error) Size: 762 B |
0
view/theme/diabook-red/icons/camera.png
Executable file → Normal file
Before (image error) Size: 685 B After (image error) Size: 685 B |
0
view/theme/diabook-red/icons/close_box.png
Executable file → Normal file
Before (image error) Size: 206 B After (image error) Size: 206 B |
0
view/theme/diabook-red/icons/contacts.png
Executable file → Normal file
Before (image error) Size: 588 B After (image error) Size: 588 B |
0
view/theme/diabook-red/icons/contacts2.png
Executable file → Normal file
Before (image error) Size: 549 B After (image error) Size: 549 B |