fbpost: Only mirror posts from pages when they are from the page id

privacy_image_cache: Save pictures with extensions
This commit is contained in:
Michael Vogel 2013-02-18 23:39:27 +01:00
parent 6b124bf016
commit d34c78296e
2 changed files with 26 additions and 8 deletions

View file

@ -1042,6 +1042,9 @@ function fbpost_fetchwall($a, $uid) {
if(isset($item->privacy) && ($item->privacy->value !== 'EVERYONE') && ($item->privacy->value !== '')) if(isset($item->privacy) && ($item->privacy->value !== 'EVERYONE') && ($item->privacy->value !== ''))
continue; continue;
if (($post_to_page != $item->from->id) AND ((int)$post_to_page != 0))
continue;
$_SESSION["authenticated"] = true; $_SESSION["authenticated"] = true;
$_SESSION["uid"] = $uid; $_SESSION["uid"] = $uid;

View file

@ -56,20 +56,24 @@ function privacy_image_cache_init() {
$thumb = false; $thumb = false;
// Look for filename in the arguments // Look for filename in the arguments
if (isset($a->argv[1]) OR isset($a->argv[2])) { if (isset($a->argv[1]) OR isset($a->argv[2]) OR isset($a->argv[3])) {
if (isset($a->argv[2])) if (isset($a->argv[3]))
$url = $a->argv[3];
elseif (isset($a->argv[2]))
$url = $a->argv[2]; $url = $a->argv[2];
else else
$url = $a->argv[1]; $url = $a->argv[1];
$pos = strrpos($url, "==."); $pos = strrpos($url, "=.");
if ($pos) if ($pos)
$url = substr($url, 0, $pos+2); $url = substr($url, 0, $pos+1);
$url = str_replace(array(".jpg", ".jpeg", ".gif", ".png"), array("","","",""), $url);
$url = base64_decode(strtr($url, '-_', '+/'), true); $url = base64_decode(strtr($url, '-_', '+/'), true);
if ($url) if ($url)
$_REQUEST['url'] = $url; $_REQUEST['url'] = $url;
$thumb = (isset($a->argv[3]) and ($a->argv[3] == "thumb")); $thumb = (isset($a->argv[3]) and ($a->argv[3] == "thumb"));
} }
@ -201,9 +205,15 @@ function privacy_image_cache_init() {
function privacy_image_cache_cachename($url, $writemode = false) { function privacy_image_cache_cachename($url, $writemode = false) {
global $_SERVER; global $_SERVER;
// echo $url;
// $mime = image_type_to_mime_type(exif_imagetype($url)); $pos = strrpos($url, ".");
// echo $mime; if ($pos) {
$extension = strtolower(substr($url, $pos+1));
$pos = strpos($extension, "?");
if ($pos)
$extension = substr($extension, 0, $pos);
}
$basepath = $_SERVER["DOCUMENT_ROOT"]."/privacy_image_cache"; $basepath = $_SERVER["DOCUMENT_ROOT"]."/privacy_image_cache";
$path = substr(hash("md5", $url), 0, 2); $path = substr(hash("md5", $url), 0, 2);
@ -216,6 +226,11 @@ function privacy_image_cache_cachename($url, $writemode = false) {
$path .= "/".strtr(base64_encode($url), '+/', '-_'); $path .= "/".strtr(base64_encode($url), '+/', '-_');
$extensions = array("jpg", "jpeg", "gif", "png");
if (in_array($extension, $extensions))
$path .= ".".$extension;
return($path); return($path);
} }