Edited view/sv/cropbody.tpl via GitHub

[friendica.git] / mod / photos.php

diff --git a/mod/photos.php b/mod/photos.php
index d4835ba5ea65edb515a35087c08483f8ac3419e9..854c6ee1418f2f81e62c12f6ab4f6d8ea04d5786 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -182,13 +182,11 @@ foreach($_FILES AS $key => $val) {
                                        );
 
                                        $drop_id = intval($rr['id']);
-                                       $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
 
                                        // send the notification upstream/downstream as the case may be
 
                                        if($rr['visible'])
-                                               //proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" & ",array(),$foo));
-                                               proc_run($php_path,"include/notifier.php","drop","$drop_id");
+                                               proc_run('php',"include/notifier.php","drop","$drop_id");
                                }
                        }
                }
@@ -232,11 +230,9 @@ foreach($_FILES AS $key => $val) {
 
                                $url = $a->get_baseurl();
                                $drop_id = intval($i[0]['id']);
-                               $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
 
                                if($i[0]['visible'])
-                                       //proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" & ",       array(),$foo));
-                                       proc_run($php_path,"include/notifier.php","drop","$drop_id");
+                                       proc_run('php',"include/notifier.php","drop","$drop_id");
                        }
                }
 
@@ -250,6 +246,11 @@ foreach($_FILES AS $key => $val) {
                $rawtags     = ((x($_POST,'newtag'))  ? notags(trim($_POST['newtag']))  : '');
                $item_id     = ((x($_POST,'item_id')) ? intval($_POST['item_id'])       : 0);
                $albname     = ((x($_POST,'albname')) ? notags(trim($_POST['albname'])) : '');
+               $str_group_allow   = perms2str($_POST['group_allow']);
+               $str_contact_allow = perms2str($_POST['contact_allow']);
+               $str_group_deny    = perms2str($_POST['group_deny']);
+               $str_contact_deny  = perms2str($_POST['contact_deny']);
+
                $resource_id = $a->argv[2];
 
                if(! strlen($albname))
@@ -260,10 +261,14 @@ foreach($_FILES AS $key => $val) {
                        dbesc($resource_id),
                        intval($page_owner_uid)
                );
-               if((count($p)) && (($p[0]['desc'] !== $desc) || ($p[0]['album'] !== $albname))) {
-                       $r = q("UPDATE `photo` SET `desc` = '%s', `album` = '%s' WHERE `resource-id` = '%s' AND `uid` = %d",
+               if(count($p)) {
+                       $r = q("UPDATE `photo` SET `desc` = '%s', `album` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' WHERE `resource-id` = '%s' AND `uid` = %d",
                                dbesc($desc),
                                dbesc($albname),
+                               dbesc($str_contact_allow),
+                               dbesc($str_group_allow),
+                               dbesc($str_contact_deny),
+                               dbesc($str_group_deny),
                                dbesc($resource_id),
                                intval($page_owner_uid)
                        );
@@ -474,9 +479,8 @@ foreach($_FILES AS $key => $val) {
                                        $arr['target'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '" />' . "\n" . '<link rel="preview" type="image/jpeg" href="' . $a->get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.jpg' . '" />') . '</link></target>';
 
                                        $item_id = item_store($arr);
-                                       $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-                                       //proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"tag\" \"$item_id\" & ",array(),$foo));
-                                       proc_run($php_path,"include/notifier.php","tag","$item_id");
+                                       if($item_id)
+                                               proc_run('php',"include/notifier.php","tag","$item_id");
                                }
 
                        }
@@ -1021,6 +1025,8 @@ function photos_content(&$a) {
                                '$caption' => $ph[0]['desc'],
                                '$tag_label' => t('Add a Tag'),
                                '$tags' => $link_item['tag'],
+                               '$permissions' => t('Permissions'),
+                               '$aclselect' => populate_acl($ph[0]),
                                '$help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'),
                                '$item_id' => ((count($linked_items)) ? $link_item['id'] : 0),
                                '$submit' => t('Submit'),
@@ -1038,8 +1044,14 @@ function photos_content(&$a) {
 
                        $likebuttons = '';
 
-                       if($can_post || can_write_wall($a,$owner_uid))
-                               $likebuttons = replace_macros($like_tpl,array('$id' => $link_item['id']));
+                       if($can_post || can_write_wall($a,$owner_uid)) {
+                               $likebuttons = replace_macros($like_tpl,array(
+                                       '$id' => $item['id'],
+                                       '$likethis' => t("I like this \x28toggle\x29"),
+                                       '$nolike' => t("I don't like this \x28toggle\x29"),
+                                       '$wait' => t('Please wait') 
+                               ));
+                       }
 
                        if(! count($r)) {
                                $o .= '<div id="photo-like-div">';
@@ -1153,7 +1165,7 @@ function photos_content(&$a) {
                                        $drop = '';
 
                                        if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
-                                               $drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id']));
+                                               $drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
 
 
                                        $o .= replace_macros($template,array(