Merge pull request #5 from fabrixxm/master

[friendica.git] / mod / photos.php

diff --git a/mod/photos.php b/mod/photos.php
index 1321af1920408ab32edb1f9da28798f74d53edc5..51d6a4b65cbe7ddaa2a417be89a399456d455c27 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -348,6 +348,7 @@ function photos_post(&$a) {
                        $arr['deny_gid']      = $p[0]['deny_gid'];
                        $arr['last-child']    = 1;
                        $arr['visible']       = $visibility;
+                       $arr['origin']        = 1;
                        
                        $arr['body']          = '[url=' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $p[0]['resource-id'] . ']' 
                                                . '[img]' . $a->get_baseurl() . '/photo/' . $p[0]['resource-id'] . '-' . $p[0]['scale'] . '.jpg' . '[/img]' 
@@ -407,7 +408,18 @@ function photos_post(&$a) {
                                                }
                                                else {
                                                        $newname = $name;
-                                                       if(strstr($name,'_') || strstr($name,' ')) {
+                                                       $alias = '';
+                                                       $tagcid = 0;
+                                                       if(strrpos($newname,'+'))
+                                                               $tagcid = intval(substr($newname,strrpos($newname,'+') + 1));
+
+                                                       if($tagcid) {
+                                                               $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                                                                       intval($tagcid),
+                                                                       intval($profile_uid)
+                                                               );
+                                                       }
+                                                       elseif(strstr($name,'_') || strstr($name,' ')) {
                                                                $newname = str_replace('_',' ',$name);
                                                                $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
                                                                        dbesc($newname),
@@ -506,7 +518,7 @@ function photos_post(&$a) {
                                        $arr['target-type']   = ACTIVITY_OBJ_PHOTO;
                                        $arr['tag']           = $tagged[4];
                                        $arr['inform']        = $tagged[2];
-
+                                       $arr['origin']        = 1;
                                        $arr['body']          = '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]' . ' ' . t('was tagged in a') . ' ' . '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . t('photo') . '[/url]' . ' ' . t('by') . ' ' . '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]' ;
                                        $arr['body'] .= "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . $a->get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.jpg' . '[/img][/url]' . "\n" ;
 
@@ -580,8 +592,8 @@ function photos_post(&$a) {
                $visible = 1;
        else
                $visible = 0;
-
-       if(intval($_REQUEST['not_visible']))
+       
+       if(intval($_REQUEST['not_visible']) || $_REQUEST['not_visible'] === 'true')
                $visible = 0;
 
        $str_group_allow   = perms2str(((is_array($_REQUEST['group_allow']))   ? $_REQUEST['group_allow']   : explode(',',$_REQUEST['group_allow'])));
@@ -695,6 +707,8 @@ function photos_post(&$a) {
        $arr['deny_gid']      = $str_group_deny;
        $arr['last-child']    = 1;
        $arr['visible']       = $visible;
+       $arr['origin']        = 1;
+
        $arr['body']          = '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo_hash . ']' 
                                . '[img]' . $a->get_baseurl() . "/photo/{$photo_hash}-{$smallest}.jpg" . '[/img]' 
                                . '[/url]';
@@ -831,18 +845,8 @@ function photos_content(&$a) {
        $o = "";
 
        // tabs
-       $tpl = get_markup_template('profile_tabs.tpl');
        $_is_owner = (local_user() && (local_user() == $owner_uid));
-       $o .= replace_macros($tpl,array(
-               '$url' => $a->get_baseurl() . '/profile/' .$a->data['user']['nickname'],
-               '$phototab' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'],
-               '$status' => t('Status'),
-               '$profile' => t('Profile'),
-               '$photos' => t('Photos'),
-               '$events' => (($_is_owner) ? t('Events') : ''),
-               '$notes' => (($_is_owner) ?     t('Personal Notes') : ''),
-               '$activetab' => "photos",
-       ));     
+       $o .= profile_tabs($a,$_is_owner, $a->data['user']['nickname']);        
 
        //
        // dispatch request