over-ride comment box

[friendica.git] / mod / photos.php

diff --git a/mod/photos.php b/mod/photos.php
index 4bb6e3eab47b6a96e2759d886f831aafec9bd6bb..324ce898d26003fdf188ebd919114cc43e6590a6 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -6,6 +6,10 @@ require_once('include/bbcode.php');
 
 function photos_init(&$a) {
 
+
+       if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+               return;
+       }
        $o = '';
 
        if($a->argc > 1) {
@@ -310,6 +314,7 @@ foreach($_FILES AS $key => $val) {
                        $arr['deny_gid']      = $p[0]['deny_gid'];
                        $arr['last-child']    = 1;
                        $arr['visible']       = $visibility;
+                       
                        $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]' 
                                                . '[/url]';
@@ -656,6 +661,16 @@ function photos_content(&$a) {
        // photos/name/image/xxxxx/edit
 
 
+       if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+               notice( t('Public access denied.') . EOL);
+               return;
+       }
+
+
+       require_once('include/bbcode.php');
+       require_once('include/security.php');
+       require_once('include/conversation.php');
+
        if(! x($a->data,'user')) {
                notice( t('No photos selected') . EOL );
                return;
@@ -892,8 +907,7 @@ function photos_content(&$a) {
 
        if($datatype === 'image') {
 
-               require_once('security.php');
-               require_once('bbcode.php');
+
 
                $o = '<div id="live-display"></div>' . "\r\n";
                // fetch image, item containing image, then comments
@@ -1073,7 +1087,7 @@ function photos_content(&$a) {
                        $tpl = load_view_file('view/photo_item.tpl');
                        $return_url = $a->cmd;
 
-                       $like_tpl = load_view_file('view/lik_noshare.tpl');
+                       $like_tpl = load_view_file('view/like_noshare.tpl');
 
                        $likebuttons = '';
 
@@ -1104,6 +1118,8 @@ function photos_content(&$a) {
                                                        '$mylink' => $contact['url'],
                                                        '$mytitle' => t('This is you'),
                                                        '$myphoto' => $contact['thumb'],
+                                                       '$comment' => t('Comment'),
+                                                       '$submit' => t('Submit'),
                                                        '$ww' => ''
                                                ));
                                        }
@@ -1256,17 +1272,14 @@ function photos_content(&$a) {
        if(count($r)) {
                foreach($r as $rr) {
                        $o .= replace_macros($tpl,array(
-                               '$id' => $rr['id'],
-                               '$photolink' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] 
-                                       . '/image/' . $rr['resource-id'],
+                               '$id'         => $rr['id'],
+                               '$photolink'  => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
                                '$phototitle' => t('View Photo'),
-                               '$imgsrc' => $a->get_baseurl() . '/photo/' 
-                                       . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.jpg',
-                               '$albumlink' => $a->get_baseurl() . '/photos/' 
-                                       . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
-                               '$albumname' => $rr['album'],
-                               '$albumalt' => t('View Album'),
-                               '$imgalt' => $rr['filename']
+                               '$imgsrc'     => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.jpg',
+                               '$albumlink'  => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
+                               '$albumname'  => $rr['album'],
+                               '$albumalt'   => t('View Album'),
+                               '$imgalt'     => $rr['filename']
                        ));
 
                }