updated file widget to use 1.7 elgg_get_entities* APIs

git-svn-id: http://code.elgg.org/elgg/trunk@7347 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/file/views/default/widgets/filerepo/edit.php b/mod/file/views/default/widgets/filerepo/edit.php
index 0d19016620bbdf2585dae15d9aff397fb8f7403f..0ee794dca0cd0f0c4574bd3e57d880b5d8eebbfd 100644 (file)
--- a/mod/file/views/default/widgets/filerepo/edit.php
+++ b/mod/file/views/default/widgets/filerepo/edit.php
@@ -1,4 +1,10 @@
 <?php
+/**
+ * Elgg file widget edit view
+ *
+ * @package ElggFile
+ */
+
 // set default value
 if (!isset($vars['entity']->num_display)) {
        $vars['entity']->num_display = 4;

diff --git a/mod/file/views/default/widgets/filerepo/view.php b/mod/file/views/default/widgets/filerepo/view.php
index 09c29a3ce54569c51426e7ee54c59b45fd6d5f0e..41a968dcebd18f1390942a9942a7ed47f18b7e29 100644 (file)
--- a/mod/file/views/default/widgets/filerepo/view.php
+++ b/mod/file/views/default/widgets/filerepo/view.php
@@ -1,73 +1,71 @@
 <?php
+/**
+ * Elgg file widget view
+ *
+ * @package ElggFile
+ */
 
-    //the page owner
-       $owner = $vars['entity']->owner_guid;
 
-       //the number of files to display
-       $number = (int) $vars['entity']->num_display;
-       if (!$number) {
-               $number = 4;
-       }
-
-       //get the layout view which is set by the user in the edit panel
-       $get_view = (int) $vars['entity']->gallery_list;
-       if (!$get_view || $get_view == 1) {
-           $view = "list";
-    }else{
-        $view = "gallery";
-    }
-
-       //get the user's files
-       $files = get_user_objects($vars['entity']->owner_guid, "file", $number, 0);
-
-       //if there are some files, go get them
-       if ($files) {
-
-       echo "<div id='filerepo_widget_layout'>";
-
-        if($view == "gallery"){
-
-        echo "<div class='filerepo_widget_galleryview'>";
+$owner_guid = $vars['entity']->owner_guid;
+$number = $vars['entity']->num_display;
 
-            //display in gallery mode
-            foreach($files as $f){
+//get the layout view which is set by the user in the edit panel
+$get_view = (int) $vars['entity']->gallery_list;
+if (!$get_view || $get_view == 1) {
+       $view = "list";
+} else {
+       $view = "gallery";
+}
 
-                $mime = $f->mimetype;
-                echo "<a href=\"{$f->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "</a>";
+//get the user's files
+$options = array(
+       'type' => 'object',
+       'subtype' => 'file',
+       'limit' => $number,
+       'container_guid' => $owner_guid
+);
+$files = elgg_get_entities($options);
 
-            }
+//if there are some files, go get them
+if ($files) {
 
-            echo "</div>";
+       echo "<div id='filerepo_widget_layout'>";
 
-        }else{
+       if ($view == "gallery") {
 
-            //display in list mode
-            foreach($files as $f){
+               echo "<div class='filerepo_widget_galleryview'>";
 
-                $mime = $f->mimetype;
-                echo "<div class='filerepo_widget_singleitem clearfix'>";
-               echo "<div class='filerepo_listview_icon'><a href=\"{$f->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "</a></div>";
-               echo "<div class='filerepo_widget_content'>";
-               echo "<div class='filerepo_listview_title'><p class='filerepo_title'>" . $f->title . "</p></div>";
-               echo "<div class='filerepo_listview_date'><p class='filerepo_timestamp'><small>" . elgg_view_friendly_time($f->time_created) . "</small></p></div>";
-                       echo "</div></div>";
+               //display in gallery mode
+               foreach ($files as $f) {
 
-               }
+                       $mime = $f->mimetype;
+                       echo "<a href=\"{$f->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "</a>";
+               }
 
-        }
-
-
-        //get a link to the users files
-        $users_file_url = elgg_get_site_url() . "pg/file/" . get_user($f->owner_guid)->username;
-
-        echo "<div class='filerepo_widget_singleitem_more'><a href=\"{$users_file_url}\">" . elgg_echo('file:more') . "</a></div>";
-        echo "</div>";
+               echo "</div>";
+       } else {
 
+               //display in list mode
+               foreach ($files as $f) {
+
+                       $mime = $f->mimetype;
+                       echo "<div class='filerepo_widget_singleitem clearfix'>";
+                       echo "<div class='filerepo_listview_icon'><a href=\"{$f->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "</a></div>";
+                       echo "<div class='filerepo_widget_content'>";
+                       echo "<div class='filerepo_listview_title'><p class='filerepo_title'>" . $f->title . "</p></div>";
+                       echo "<div class='filerepo_listview_date'><p class='filerepo_timestamp'><small>" . elgg_view_friendly_time($f->time_created) . "</small></p></div>";
+                       echo "</div></div>";
+               }
+       }
 
-       } else {
 
-               echo "<p class='margin_top'>" . elgg_echo("file:none") . "</p>";
+       //get a link to the users files
+       $users_file_url = elgg_get_site_url() . "pg/file/" . get_user($f->owner_guid)->username;
 
-       }
+       echo "<div class='filerepo_widget_singleitem_more'><a href=\"{$users_file_url}\">" . elgg_echo('file:more') . "</a></div>";
+       echo "</div>";
+} else {
 
+       echo "<p class='margin_top'>" . elgg_echo("file:none") . "</p>";
+}
 ?>
\ No newline at end of file