adding share owner information to the file list

diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index f4fb96a7a7c4354cf44a7500058c7ed89dc7ecf1..9769affc70fbafa5af02cb378874da22d1400d1a 100644 (file)
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -34,16 +34,16 @@ $totalsize = 0; ?>
                                <span class="nametext">
                                        <?php print_unescaped(htmlspecialchars($file['name']));?>
                                </span>
+                               <span class="uploadtext" currentUploads="0">
+                               </span>
                <?php else: ?>
                        <a class="name" href="<?php p(rtrim($_['downloadURL'],'/').'/'.trim($directory,'/').'/'.$name); ?>">
                                <label class="filetext" title="" for="select-<?php p($file['fileid']); ?>"></label>
                                <span class="nametext"><?php print_unescaped(htmlspecialchars($file['basename']));?><span class='extension'><?php p($file['extension']);?></span></span>
-                       </a>
                <?php endif; ?>
-                       <?php if($file['type'] == 'dir'):?>
-                               <span class="uploadtext" currentUploads="0">
-                               </span>
-                       <?php endif;?>
+               <?php if(isset($file['displayname_owner'])): ?>
+                               <span class="share-info"><?php p($l->t('shared by %s', array($file['displayname_owner']))) ?></span>
+               <?php endif; ?>
                        </a>
                </td>
                <td class="filesize"

diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index ec0f368386fef3560595496259982bebfa3e3316..5e00050fe1e9f5aa79584317c3806f8ef3ccb887 100644 (file)
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -94,6 +94,9 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
                                $file['mtime'] = $item['mtime'];
                                $file['encrypted'] = $item['encrypted'];
                                $file['etag'] = $item['etag'];
+                               $file['uid_owner'] = $item['uid_owner'];
+                               $file['displayname_owner'] = $item['displayname_owner'];
+
                                $storage = \OC\Files\Filesystem::getStorage('/');
                                $cache = $storage->getCache();
                                if ($item['encrypted'] or ($item['unencrypted_size'] > 0 and $cache->getMimetype($item['mimetype']) === 'httpd/unix-directory')) {