moved classes into classes directory

diff --git a/lib/album.php b/classes/TidypicsAlbum.php
similarity index 100%
rename from lib/album.php
rename to classes/TidypicsAlbum.php

diff --git a/lib/image.php b/classes/TidypicsImage.php
similarity index 85%
rename from lib/image.php
rename to classes/TidypicsImage.php
index f6ecd8ad9dedd68a8443c64f994516f056671d4a..531d549120a11197e35b51a432d0f2f42b21b416 100644 (file)
--- a/lib/image.php
+++ b/classes/TidypicsImage.php
@@ -108,7 +108,7 @@ class TidypicsImage extends ElggFile {
         * @param string $imageLib
         */
        public function saveThumbnails($imageLib) {
-               include_once dirname(__FILE__) . "/resize.php";
+               include_once dirname(dirname(__FILE__)) . "/lib/resize.php";
                
                $prefix = "image/" . $this->container_guid . "/";
                $filename = $this->getFilename();
@@ -137,7 +137,7 @@ class TidypicsImage extends ElggFile {
         * @warning image file must be saved first
         */
        public function extractExifData() {
-               include_once dirname(__FILE__) . "/exif.php";
+               include_once dirname(dirname(__FILE__)) . "/lib/exif.php";
                td_get_exif($this);
        }
        
@@ -290,48 +290,3 @@ class TidypicsImage extends ElggFile {
                }
        }
 }
-
-/**
- * get a list of people that can be tagged in an image
- *
- * @param $viewer entity
- * @return array of guid->name for tagging
- */
-function tp_get_tag_list($viewer) {
-       $friends = get_user_friends($viewer->getGUID(), '', 999, 0);
-       $friend_list = array();
-       if ($friends) {
-               foreach($friends as $friend) {
-                       //error_log("friend $friend->name");
-                       $friend_list[$friend->guid] = $friend->name;
-               }
-       }
-
-       // is this a group
-       $is_group = tp_is_group_page();
-       if ($is_group) {
-               $group_guid = page_owner();
-               $viewer_guid = $viewer->guid;
-               $members = get_group_members($group_guid, 999);
-               if (is_array($members)) {
-                       foreach ($members as $member) {
-                               if ($viewer_guid != $member->guid) {
-                                       $group_list[$member->guid] = $member->name;
-                                       //error_log("group $member->name");
-                               }
-                       }
-
-                       // combine group and friends list
-                       $intersect = array_intersect_key($friend_list, $group_list);
-                       $unique_friends = array_diff_key($friend_list, $group_list);
-                       $unique_members = array_diff_key($group_list, $friend_list);
-                       //$friend_list = array_merge($friend_list, $group_list);
-                       //$friend_list = array_unique($friend_list);
-                       $friend_list = $intersect + $unique_friends + $unique_members;
-               }
-       }
-
-       asort($friend_list);
-
-       return $friend_list;
-}

diff --git a/lib/tidypics.php b/lib/tidypics.php
index 581503a518813b4ee641523f98a8453d1f0064e0..8fcfc22c97183d5b4a0b5a9bd55250c134552263 100644 (file)
--- a/lib/tidypics.php
+++ b/lib/tidypics.php
@@ -187,3 +187,48 @@ function tp_is_person() {
 
        return false;
 }
+
+/**
+ * get a list of people that can be tagged in an image
+ *
+ * @param $viewer entity
+ * @return array of guid->name for tagging
+ */
+function tp_get_tag_list($viewer) {
+       $friends = get_user_friends($viewer->getGUID(), '', 999, 0);
+       $friend_list = array();
+       if ($friends) {
+               foreach($friends as $friend) {
+                       //error_log("friend $friend->name");
+                       $friend_list[$friend->guid] = $friend->name;
+               }
+       }
+
+       // is this a group
+       $is_group = tp_is_group_page();
+       if ($is_group) {
+               $group_guid = page_owner();
+               $viewer_guid = $viewer->guid;
+               $members = get_group_members($group_guid, 999);
+               if (is_array($members)) {
+                       foreach ($members as $member) {
+                               if ($viewer_guid != $member->guid) {
+                                       $group_list[$member->guid] = $member->name;
+                                       //error_log("group $member->name");
+                               }
+                       }
+
+                       // combine group and friends list
+                       $intersect = array_intersect_key($friend_list, $group_list);
+                       $unique_friends = array_diff_key($friend_list, $group_list);
+                       $unique_members = array_diff_key($group_list, $friend_list);
+                       //$friend_list = array_merge($friend_list, $group_list);
+                       //$friend_list = array_unique($friend_list);
+                       $friend_list = $intersect + $unique_friends + $unique_members;
+               }
+       }
+
+       asort($friend_list);
+
+       return $friend_list;
+}

diff --git a/start.php b/start.php
index 3543dede1f4c9f541702a8f510709dd773cba381..167db651e4b0b48e70233517ca84f1b9b9be7304 100644 (file)
--- a/start.php
+++ b/start.php
@@ -10,9 +10,9 @@ define('TP_OLD_ALBUM', 0);
 define('TP_NEW_ALBUM', 1);
 
 // include core libraries
-include dirname(__FILE__) . "/lib/tidypics.php";
-include dirname(__FILE__) . "/lib/image.php";
-include dirname(__FILE__) . "/lib/album.php";
+require dirname(__FILE__) . "/lib/tidypics.php";
+require dirname(__FILE__) . "/classes/TidypicsImage.php";
+require dirname(__FILE__) . "/classes/TidypicsAlbum.php";
 
 
 // Make sure tidypics_init is called on initialization