aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-10-03 17:03:24 -0700
committerzotlabs <mike@macgirvin.com>2017-10-03 17:03:24 -0700
commit7fb02752de4e3ee62d84eaf30bcb4c155ebabf30 (patch)
tree1518b70df17b60d9faf86b63089a220960a333e0
parentd88d4b3c3ac1cd741f03b667b3d35696ba77d2dd (diff)
downloadvolse-hubzilla-7fb02752de4e3ee62d84eaf30bcb4c155ebabf30.tar.gz
volse-hubzilla-7fb02752de4e3ee62d84eaf30bcb4c155ebabf30.tar.bz2
volse-hubzilla-7fb02752de4e3ee62d84eaf30bcb4c155ebabf30.zip
hubzilla issue #868
-rw-r--r--Zotlabs/Module/Thing.php4
-rw-r--r--include/photo/photo_driver.php21
2 files changed, 25 insertions, 0 deletions
diff --git a/Zotlabs/Module/Thing.php b/Zotlabs/Module/Thing.php
index 95c6c5636..f816632ab 100644
--- a/Zotlabs/Module/Thing.php
+++ b/Zotlabs/Module/Thing.php
@@ -91,6 +91,7 @@ class Thing extends \Zotlabs\Web\Controller {
}
$orig_record = $t[0];
if($photo != $orig_record['obj_imgurl']) {
+ delete_thing_photo($orig_record['obj_imgurl'],get_observer_hash());
$arr = import_xchan_photo($photo,get_observer_hash(),true);
$local_photo = $arr[0];
$local_photo_type = $arr[3];
@@ -336,6 +337,9 @@ class Thing extends \Zotlabs\Web\Controller {
return '';
}
+
+ delete_thing_photo($r[0]['obj_imgurl'],get_observer_hash());
+
$x = q("delete from obj where obj_obj = '%s' and obj_type = %d and obj_channel = %d",
dbesc($thing_hash),
intval(TERM_OBJ_THING),
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index 17ca81419..3b6beabf5 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -518,6 +518,27 @@ function guess_image_type($filename, $headers = '') {
}
+
+function delete_thing_photo($url,$ob_hash) {
+
+ $hash = basename($url);
+ $hash = substr($hash,0,strpos($hash,'-'));
+
+ // hashes should be 32 bytes.
+
+ if(strlen($hash) < 16)
+ return;
+
+ $r = q("delete from photo where xchan = '%s' and photo_usage = %d and resource_id = '%s'",
+ dbesc($ob_hash),
+ intval(PHOTO_THING),
+ dbesc($hash)
+ );
+
+}
+
+
+
function import_xchan_photo($photo,$xchan,$thing = false) {
$flags = (($thing) ? PHOTO_THING : PHOTO_XCHAN);