added convenience function for front page

diff --git a/lib/exif.php b/lib/exif.php
index 9d5ae634327e88cbf3b5ffb2caf7c01a9512565e..2bc25c9962927d3a360a13c9d0cd718178b5d379 100644 (file)
--- a/lib/exif.php
+++ b/lib/exif.php
@@ -1,5 +1,4 @@
 <?php
-include_once dirname(__FILE__) . "/tidypics.php";
 
 function td_get_exif($file) {
        $mime = $file->mimetype;

diff --git a/lib/tidypics.php b/lib/tidypics.php
index 1254f3ff617b461e58e84ce1bb4d74897160486a..d81b3ab2f496e40a5f75f1107dbc3af8d517a200 100644 (file)
--- a/lib/tidypics.php
+++ b/lib/tidypics.php
@@ -4,6 +4,41 @@
         * \r
         */\r
 \r
+       /**\r
+        * Get images for display on front page\r
+        *\r
+        * @param int number of images\r
+        * @param int (optional) guid of owner\r
+        * @return string of html for display\r
+        *\r
+        * To use with the custom index plugin, use something like this:\r
+       \r
+       if (is_plugin_enabled('tidypics')) {\r
+?>\r
+       <!-- display latest photos -->\r
+               <div class="index_box">\r
+                       <h2><a href="<?php echo $vars['url']; ?>pg/photos/world/"><?php echo elgg_echo("tidypics:mostrecent"); ?></a></h2>\r
+                       <div class="contentWrapper">\r
+                       <?php\r
+                               echo tp_get_latest_photos(5);\r
+                       ?>\r
+                       </div>\r
+               </div>\r
+<?php\r
+       }\r
+?>\r
+\r
+        * Good luck\r
+        */\r
+       function tp_get_latest_photos($num_images, $owner_guid = 0)\r
+       {\r
+               $prev_context = set_context('front');\r
+               $image_html = list_entities('object', 'image', $owner_guid, $num_images, false, false, false);  \r
+               set_context($prev_context);\r
+               return $image_html;\r
+       }\r
+       \r
+       \r
        /**\r
         * Get image directory path\r
         *\r

diff --git a/lib/watermark.php b/lib/watermark.php
index ddc41a36b434ffeb61d1a46b33827720210f460c..330ae7b29a026bfd72bb9ffc4ac40bcbef28c1bd 100644 (file)
--- a/lib/watermark.php
+++ b/lib/watermark.php
@@ -1,7 +1,5 @@
 <?php
 
-include_once dirname(__FILE__) . "/tidypics.php";
-
 
 function tp_watermark($thumbs) {
        global $CONFIG;

diff --git a/start.php b/start.php
index cfd20db62f677928f03fc304e67e9ea1580e0364..24423dafddde05e3f6566e4ccb251e8573ec6d20 100644 (file)
--- a/start.php
+++ b/start.php
@@ -8,6 +8,8 @@
        define('TP_OLD_ALBUM', 0);\r
        define('TP_NEW_ALBUM', 1);\r
 \r
+       // include core libraries\r
+       include dirname(__FILE__) . "/lib/tidypics.php";\r
        \r
        \r
        /**\r

diff --git a/views/default/object/image.php b/views/default/object/image.php
index 9e78ece75ab0040c28b6e9e0b5fdaf4718bb7782..c99bb1ed9e63c3850dfa0734309c69d0418ece79 100644 (file)
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -56,17 +56,17 @@ if ($photo_tags) {
 }
 
 
-/////////////////////////////////////////////////////
-//
-// search view of an image
-//
-/////////////////////////////////////////////////////
+/********************************************************************
+ *
+ * search view of an image
+ *
+ ********************************************************************/
        if (get_context() == "search") { 
 
                if (get_input('search_viewtype') == "gallery") {
                        ?>
                        <div class="tidypics_album_images">
-                               <a href="<?php echo $file->getURL();?>"><img src="<?php echo $vars['url'];?>mod/tidypics/thumbnail.php?file_guid=<?php echo $file_guid;?>&size=small" border="0" alt="thumbnail"/></a>
+                               <a href="<?php echo $file->getURL();?>"><img src="<?php echo $vars['url'];?>mod/tidypics/thumbnail.php?file_guid=<?php echo $file_guid;?>&size=small" alt="thumbnail"/></a>
                        </div>
                        <?php
                }
@@ -82,26 +82,35 @@ if ($photo_tags) {
 
                        echo elgg_view_listing($icon, $info);
                }
+/***************************************************************
+ *
+ * front page view 
+ *
+ ****************************************************************/
+       } else if (get_context() == "front") {
+?>
+               <a href="<?php echo $file->getURL();?>"><img src="<?php echo $vars['url'];?>mod/tidypics/thumbnail.php?file_guid=<?php echo $file_guid;?>&amp;size=thumb" class="tidypics_album_cover" alt="<?php echo $title; ?>" title="<?php echo $title; ?>" /></a>
+<?php
        } else {
 
-////////////////////////////////////////////////
-//
-//  simple gallery view - when is this called?
-//
-////////////////////////////////////////////////
+/********************************************************************
+ *
+ *  simple gallery view - when is this called?
+ *
+ *********************************************************************/
                if (!$vars['full']) {
 ?>
        <div class="tidypics_album_images">
-               <a href="<?php echo $file->getURL();?>"><img src="<?php echo $vars['url'];?>mod/tidypics/thumbnail.php?file_guid=<?php echo $file_guid;?>&size=small" border="0" alt="thumbnail"/></a>
+               <a href="<?php echo $file->getURL();?>"><img src="<?php echo $vars['url'];?>mod/tidypics/thumbnail.php?file_guid=<?php echo $file_guid;?>&size=small" alt="thumbnail"/></a>
        </div>
 <?php
                } else {
 
-////////////////////////////////////////////////////////
-//
-//  tidypics individual image display
-//
-////////////////////////////////////////////////////////
+/********************************************************************
+ *
+ *  tidypics individual image display
+ *
+ *********************************************************************/
 
                        $view_count = get_plugin_setting('view_count', 'tidypics');
                        

diff --git a/views/default/river/object/album/create.php b/views/default/river/object/album/create.php
index 9c2486fa2b9e707e192dddc2a2212825659e0904..a9b26156677c152dafd15f8b12d224c0cb3d5a6c 100644 (file)
--- a/views/default/river/object/album/create.php
+++ b/views/default/river/object/album/create.php
@@ -20,7 +20,7 @@
        \r
        if ($album_river_view == "cover") {\r
                if ($album->cover) {\r
-                       $string .= "<div class=\"river_content\"> <img src=\"" . $CONFIG->wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" border="0" class="tidypics_album_cover"  alt="thumbnail"/>' . "</div>";\r
+                       $string .= "<div class=\"river_content\"> <img src=\"" . $CONFIG->wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/>' . "</div>";\r
                }\r
        } else {\r
 \r
@@ -30,7 +30,7 @@
 \r
                if (count($images)) {\r
                        foreach($images as $image){\r
-                               $string .= "<a href=\"" . $image->getURL() . "\"> <img src=\"" . $CONFIG->wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" border="0" class="tidypics_album_cover"  alt="thumbnail"/> </a>';\r
+                               $string .= "<a href=\"" . $image->getURL() . "\"> <img src=\"" . $CONFIG->wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/> </a>';\r
                        }\r
                }\r
 \r

diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php
index 8f7a856eae35d1ff97483610778ee5f9af0b7c25..5229e109a760c5e1ba9707f2d22d721e5d297c36 100644 (file)
--- a/views/default/river/object/image/create.php
+++ b/views/default/river/object/image/create.php
@@ -19,9 +19,9 @@
        $string .= "<div class=\"river_content\">";\r
 \r
 /*     // this adds the album cover to the river display \r
-       $string .= "<a href=\"" . $album->getURL() . "\"> <img src=\"" . $CONFIG->wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" border="0" class="tidypics_album_cover"  alt="thumbnail"/> </a>';\r
+       $string .= "<a href=\"" . $album->getURL() . "\"> <img src=\"" . $CONFIG->wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/> </a>';\r
 */\r
-       $string .= "<a href=\"" . $image->getURL() . "\"> <img src=\"" . $CONFIG->wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" border="0" class="tidypics_album_cover"  alt="thumbnail"/> </a>';\r
+       $string .= "<a href=\"" . $image->getURL() . "\"> <img src=\"" . $CONFIG->wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/> </a>';\r
        $string .= "</div>";\r
        \r
        echo $string;\r

diff --git a/views/default/tidypics/forms/edit_multi.php b/views/default/tidypics/forms/edit_multi.php
index 01ffb3128e8dde99a7d58cbde38969e179e14113..f6c29e4a5a0af7c2f4038a04c588dd310b8df48e 100644 (file)
--- a/views/default/tidypics/forms/edit_multi.php
+++ b/views/default/tidypics/forms/edit_multi.php
@@ -27,7 +27,7 @@
                }\r
                \r
                echo '<div class="tidypics_edit_image_container">';\r
-               echo '<img src="' . $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=' . $guid . '&size=small" border="0" class="tidypics_edit_images" alt="' . $title . '"/>';\r
+               echo '<img src="' . $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=' . $guid . '&size=small" class="tidypics_edit_images" alt="' . $title . '"/>';\r
                echo '<div class="tidypics_image_info">';\r
                echo '<p><label>' . elgg_echo('album:title') . '</label>';\r
                echo elgg_view("input/text", array("internalname" => "title[$key]", "value" => $title,)) . "\n";\r