bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge remote branch 'upstream/master'

Browse source
This commit is contained in:
zottel 2012-04-09 02:20:34 +02:00
commit 7cf946e004
26 changed files with 517 additions and 352 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1305' );
define ( 'FRIENDICA_VERSION', '2.3.1306' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1137 );

2
mod/item.php
View file

@ -351,7 +351,7 @@ function item_post(&$a) {
$image_uri = substr($image_uri,0, strpos($image_uri,'-'));
if(! strlen($image_uri))
continue;
$srch = '<' . intval($profile_uid) . '>';
$srch = '<' . intval($contact_record['id']) . '>';
$r = q("SELECT `id` FROM `photo` WHERE `allow_cid` = '%s' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = ''
AND `resource-id` = '%s' AND `uid` = %d LIMIT 1",
dbesc($srch),

5
mod/wall_attach.php
View file

@ -7,7 +7,7 @@ function wall_attach_post(&$a) {
if($a->argc > 1) {
$nick = $a->argv[1];
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
$r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
dbesc($nick)
);
if(! count($r))
@ -21,6 +21,7 @@ function wall_attach_post(&$a) {
$visitor = 0;
$page_owner_uid = $r[0]['uid'];
$page_owner_cid = $r[0]['id'];
$page_owner_nick = $r[0]['nickname'];
$community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
@ -73,7 +74,7 @@ function wall_attach_post(&$a) {
dbesc($filedata),
dbesc($created),
dbesc($created),
dbesc('<' . $page_owner_uid . '>'),
dbesc('<' . $page_owner_cid . '>'),
dbesc(''),
dbesc(''),
dbesc('')

8
mod/wall_upload.php
View file

@ -6,7 +6,7 @@ function wall_upload_post(&$a) {
if($a->argc > 1) {
$nick = $a->argv[1];
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
$r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
dbesc($nick)
);
if(! count($r))
@ -16,10 +16,13 @@ function wall_upload_post(&$a) {
else
return;
$can_post = false;
$visitor = 0;
$page_owner_uid = $r[0]['uid'];
$default_cid = $r[0]['id'];
$page_owner_nick = $r[0]['nickname'];
$community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
@ -34,6 +37,7 @@ function wall_upload_post(&$a) {
if(count($r)) {
$can_post = true;
$visitor = remote_user();
$default_cid = $visitor;
}
}
}
@ -76,7 +80,7 @@ function wall_upload_post(&$a) {
$smallest = 0;
$defperm = '<' . $page_owner_uid . '>';
$defperm = '<' . $default_cid . '>';
$r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 0, 0, $defperm);

628
util/messages.po
View file

File diff suppressed because it is too large Load diff

4
view/theme/diabook-aerith/oembed_video.tpl Normal file
View file

@ -0,0 +1,4 @@
<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
<img width='$tw' height='$th' src='$turl' >
<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
</a>

2
view/theme/diabook-aerith/style-network.css
View file

@ -2173,7 +2173,7 @@ blockquote {
color: #777;
}
.oembed {
font-size: large;
font-weight: bold;
}
.aprofile dt{

2
view/theme/diabook-aerith/style-profile.css
View file

@ -2162,7 +2162,7 @@ blockquote {
color: #777;
}
.oembed {
font-size: large;
font-weight: bold;
}
.aprofile dt{

4
view/theme/diabook-aerith/style.css
View file

@ -1276,7 +1276,7 @@ body .pageheader{
font-size: 20px;
margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
max-width: 775px;
}
.qcomment{
max-width: 122px;
@ -2324,7 +2324,7 @@ blockquote {
color: #777;
}
.oembed {
font-size: large;
font-weight: bold;
}
.aprofile dt{

45
view/theme/diabook-aerith/theme.php
View file

@ -3,13 +3,13 @@
/*
* Name: Diabook-aerith
* Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: (Version: 1.014)
* Version: (Version: 1.015)
* Author:
*/
//print diabook-version for debugging
$diabook_version = "Diabook-aerith (Version: 1.014)";
$diabook_version = "Diabook-aerith (Version: 1.015)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
@ -366,6 +366,35 @@ $a->page['htmlhead'] .= '
</script>';
$a->page['htmlhead'] .= '
<script>
$(document).ready(function() {
$("iframe").each(function(){
var ifr_source = $(this).attr("src");
var wmode = "wmode=transparent";
if(ifr_source.indexOf("?") != -1) {
var getQString = ifr_source.split("?");
var oldString = getQString[1];
var newString = getQString[0];
$(this).attr("src",newString+"?"+wmode+"&"+oldString);
}
else $(this).attr("src",ifr_source+"?"+wmode);
});
});
function yt_iframe() {
$("iframe").load(function() {
var ifr_src = $(this).contents().find("body iframe").attr("src");
$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
});
};
</script>';
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
$a->page['htmlhead'] .= '
@ -374,7 +403,12 @@ $a->page['htmlhead'] .= '
$(function() {
$(".oembed.photo img").aeImageResize({height: 400, width: 400});
});
</script>';
if($ccCookie != "8") {
$a->page['htmlhead'] .= '
<script>
$("right_aside").ready(function(){
if($.cookie("close_pages") == "1")
@ -458,9 +492,10 @@ function close_lastlikes(){
document.getElementById( "close_lastlikes" ).style.display = "none";
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
};
</script>';}
$a->page['htmlhead'] .= '
<script>
function restore_boxes(){
$.cookie("close_pages","2", { expires: 365, path: "/" });
$.cookie("close_helpers","2", { expires: 365, path: "/" });
@ -471,5 +506,5 @@ function restore_boxes(){
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
alert("Right-hand column was restored. Please refresh your browser");
};
}
</script>';}

4
view/theme/diabook-blue/oembed_video.tpl Normal file
View file

@ -0,0 +1,4 @@
<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
<img width='$tw' height='$th' src='$turl' >
<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
</a>

2
view/theme/diabook-blue/style-network.css
View file

@ -2134,7 +2134,7 @@ blockquote {
color: #777;
}
.oembed {
font-size: large;
font-weight: bold;
}
.aprofile dt{

2
view/theme/diabook-blue/style-profile.css
View file

@ -2129,7 +2129,7 @@ blockquote {
color: #777;
}
.oembed {
font-size: large;
font-weight: bold;
}
.aprofile dt{

4
view/theme/diabook-blue/style.css
View file

@ -1236,7 +1236,7 @@ body .pageheader{
font-size: 20px;
margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
max-width: 775px;
}
.qcomment{
max-width: 122px;
@ -2281,7 +2281,7 @@ blockquote {
color: #777;
}
.oembed {
font-size: large;
font-weight: bold;
}
.aprofile dt{

48
view/theme/diabook-blue/theme.php
View file

@ -3,13 +3,13 @@
/*
* Name: Diabook-blue
* Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: (Version: 1.014)
* Version: (Version: 1.015)
* Author:
*/
//print diabook-version for debugging
$diabook_version = "Diabook-blue (Version: 1.014)";
$diabook_version = "Diabook-blue (Version: 1.015)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages
@ -366,15 +366,50 @@ $a->page['htmlhead'] .= '
</script>';
$a->page['htmlhead'] .= '
<script>
$(document).ready(function() {
$("iframe").each(function(){
var ifr_source = $(this).attr("src");
var wmode = "wmode=transparent";
if(ifr_source.indexOf("?") != -1) {
var getQString = ifr_source.split("?");
var oldString = getQString[1];
var newString = getQString[0];
$(this).attr("src",newString+"?"+wmode+"&"+oldString);
}
else $(this).attr("src",ifr_source+"?"+wmode);
});
});
function yt_iframe() {
$("iframe").load(function() {
var ifr_src = $(this).contents().find("body iframe").attr("src");
$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
});
};
</script>';
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
$a->page['htmlhead'] .= '
<script>
$(function() {
$(function() {
$(".oembed.photo img").aeImageResize({height: 400, width: 400});
});
</script>';
if($ccCookie != "8") {
$a->page['htmlhead'] .= '
<script>
$("right_aside").ready(function(){
if($.cookie("close_pages") == "1")
@ -458,9 +493,10 @@ function close_lastlikes(){
document.getElementById( "close_lastlikes" ).style.display = "none";
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
};
</script>';}
$a->page['htmlhead'] .= '
<script>
function restore_boxes(){
$.cookie("close_pages","2", { expires: 365, path: "/" });
$.cookie("close_helpers","2", { expires: 365, path: "/" });
@ -471,5 +507,5 @@ function restore_boxes(){
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
alert("Right-hand column was restored. Please refresh your browser");
};
}
</script>';}

4
view/theme/diabook-red/oembed_video.tpl Normal file
View file

@ -0,0 +1,4 @@
<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
<img width='$tw' height='$th' src='$turl' >
<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
</a>

2
view/theme/diabook-red/style-network.css
View file

@ -2171,7 +2171,7 @@ blockquote {
color: #777;
}
.oembed {
font-size: large;
font-weight: bold;
}
.aprofile dt{

2
view/theme/diabook-red/style-profile.css
View file

@ -2143,7 +2143,7 @@ blockquote {
color: #777;
}
.oembed {
font-size: large;
font-weight: bold;
}
.aprofile dt{

4
view/theme/diabook-red/style.css
View file

@ -1266,7 +1266,7 @@ body .pageheader{
font-size: 20px;
margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
max-width: 775px;
}
.qcomment{
max-width: 122px;
@ -2310,7 +2310,7 @@ blockquote {
color: #777;
}
.oembed {
font-size: large;
font-weight: bold;
}
.aprofile dt{

50
view/theme/diabook-red/theme.php
View file

@ -3,13 +3,13 @@
/*
* Name: Diabook-red
* Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: (Version: 1.014)
* Version: (Version: 1.015)
* Author:
*/
//print diabook-version for debugging
$diabook_version = "Diabook-red (Version: 1.014)";
$diabook_version = "Diabook-red (Version: 1.015)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages
@ -367,15 +367,50 @@ $a->page['htmlhead'] .= '
</script>';
$a->page['htmlhead'] .= '
<script>
$(document).ready(function() {
$("iframe").each(function(){
var ifr_source = $(this).attr("src");
var wmode = "wmode=transparent";
if(ifr_source.indexOf("?") != -1) {
var getQString = ifr_source.split("?");
var oldString = getQString[1];
var newString = getQString[0];
$(this).attr("src",newString+"?"+wmode+"&"+oldString);
}
else $(this).attr("src",ifr_source+"?"+wmode);
});
});
function yt_iframe() {
$("iframe").load(function() {
var ifr_src = $(this).contents().find("body iframe").attr("src");
$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
});
};
</script>';
if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
$a->page['htmlhead'] .= '
<script>
$(function() {
$(function() {
$(".oembed.photo img").aeImageResize({height: 400, width: 400});
});
</script>';
if($ccCookie != "8") {
$a->page['htmlhead'] .= '
<script>
$("right_aside").ready(function(){
if($.cookie("close_pages") == "1")
@ -459,9 +494,10 @@ function close_lastlikes(){
document.getElementById( "close_lastlikes" ).style.display = "none";
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
};
</script>';}
$a->page['htmlhead'] .= '
<script>
function restore_boxes(){
$.cookie("close_pages","2", { expires: 365, path: "/" });
$.cookie("close_helpers","2", { expires: 365, path: "/" });
@ -472,5 +508,5 @@ function restore_boxes(){
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
alert("Right-hand column was restored. Please refresh your browser");
};
</script>';}
}
</script>';}

2
view/theme/diabook/oembed_video.tpl
View file

@ -1,4 +1,4 @@
<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); return false;' style='float:left; margin: 1em; position: relative;'>
<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe(); return false;' style='float:left; margin: 1em; position: relative;'>
<img width='$tw' height='$th' src='$turl' >
<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
</a>

3
view/theme/diabook/style-network.css
View file

@ -2103,7 +2103,6 @@ blockquote {
color: #777;
}
.oembed {
font-size: large;
font-weight: bold;
}
.aprofile dt{
@ -2549,4 +2548,4 @@ list-style-type: disc;
#photos-upload-newalbum-div {
float: left;
width: 175px;
}
}

3
view/theme/diabook/style-profile.css
View file

@ -2100,7 +2100,6 @@ blockquote {
color: #777;
}
.oembed {
font-size: large;
font-weight: bold;
}
.aprofile dt{
@ -2546,4 +2545,4 @@ list-style-type: disc;
#photos-upload-newalbum-div {
float: left;
width: 175px;
}
}

2
view/theme/diabook/style-settings.css
View file

@ -2526,4 +2526,4 @@ list-style-type: disc;
#photos-upload-newalbum-div {
float: left;
width: 175px;
}
}

5
view/theme/diabook/style.css
View file

@ -1219,7 +1219,7 @@ body .pageheader{
font-size: 20px;
margin-bottom: 20px;
margin-top: 0px;
max-width: 575px;
max-width: 775px;
}
.qcomment{
max-width: 122px;
@ -2246,7 +2246,6 @@ blockquote {
color: #777;
}
.oembed {
font-size: large;
font-weight: bold;
}
.aprofile dt{
@ -2687,4 +2686,4 @@ list-style-type: disc;
#photos-upload-newalbum-div {
float: left;
width: 175px;
}
}

30
view/theme/diabook/theme.php
View file

@ -3,13 +3,13 @@
/*
* Name: Diabook
* Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version: (Version: 1.014)
* Version: (Version: 1.015)
* Author:
*/
//print diabook-version for debugging
$diabook_version = "Diabook (Version: 1.014)";
$diabook_version = "Diabook (Version: 1.015)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages
@ -376,11 +376,12 @@ $a->page['htmlhead'] .= '
</script>';
$a->page['htmlhead'] .= '
<script>
$(document).ready(function() {
$(".embed_yt iframe").each(function(){
$("iframe").each(function(){
var ifr_source = $(this).attr("src");
var wmode = "wmode=transparent";
if(ifr_source.indexOf("?") != -1) {
@ -391,7 +392,18 @@ $(document).ready(function() {
}
else $(this).attr("src",ifr_source+"?"+wmode);
});
});
function yt_iframe() {
$("iframe").load(function() {
var ifr_src = $(this).contents().find("body iframe").attr("src");
$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
});
};
</script>';
@ -403,7 +415,12 @@ $a->page['htmlhead'] .= '
$(function() {
$(".oembed.photo img").aeImageResize({height: 400, width: 400});
});
</script>';
if($ccCookie != "8") {
$a->page['htmlhead'] .= '
<script>
$("right_aside").ready(function(){
if($.cookie("close_pages") == "1")
@ -487,9 +504,10 @@ function close_lastlikes(){
document.getElementById( "close_lastlikes" ).style.display = "none";
$.cookie("close_lastlikes","1", { expires: 365, path: "/" });
};
</script>';}
$a->page['htmlhead'] .= '
<script>
function restore_boxes(){
$.cookie("close_pages","2", { expires: 365, path: "/" });
$.cookie("close_helpers","2", { expires: 365, path: "/" });
@ -500,5 +518,5 @@ function restore_boxes(){
$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
alert("Right-hand column was restored. Please refresh your browser");
};
}
</script>';}