Merge pull request #11 from rohit1290/master

Use "elgg_with_rest_api" folder instead of "web_services"

Author: manlui

APIs/API List.html

@@ -1,8 +1,95 @@
-Web Services
+Elgg Web Services with REST API
 ============
 
-This plugin provides the web services API that was packaged with Elgg core from
-version 1.0-1.8. Other plugins can expose functions as web services for 
-integration with other platforms or applications.
+Documentation is available at [http://learn.elgg.org](http://learn.elgg.org/en/stable/guides/web* services.html)
 
-Documentation is available at [http://learn.elgg.org](http://learn.elgg.org/en/stable/guides/web-services.html)
+List of API's available:
+
+* search.site
+* album.get_posts
+* album.getid
+* auth.gettoken
+* auth.token_check
+* blog.delete_post
+* blog.get_comments
+* blog.get_post
+* blog.get_posts
+* blog.post_comment
+* blog.save_post
+* bookmark.get_comments
+* bookmark.get_post
+* bookmark.get_posts
+* bookmark.post_comment
+* bookmark.save_post
+* count.like_comment
+* file.get_comments
+* file.delete_comment
+* file.delete_post
+* file.update_post
+* file.get_file
+* file.get_files
+* file.get_post
+* file.post_comment
+* file.save_post
+* gcm.register
+* group.get_activity
+* group.get_icon
+* group.get_list
+* group.join_group
+* group.leave_group
+* image.get_photos
+* image.get_post
+* image.save_post
+* likes.add
+* likes.count
+* likes.delete
+* likes.getusers
+* message.send
+* messages.count
+* messages.delete
+* messages.inbox
+* messages.mark_all_as_read
+* messages.mark_all_as_unread
+* messages.mark_as_unread
+* messages.multiple_delete
+* messages.read
+* messages.sent
+* post.get_comments
+* site.getapi
+* site.user_can_edit
+* site.get_list_plugin
+* site.getinfo
+* site.river_friends
+* site.river_mine
+* site.river_short
+* system.api.list
+* user.forgot_password
+* user.check_username_availability
+* user.friend.add
+* user.friend.get_friends
+* user.friend.get_friends_of
+* user.friend.is.friend.of
+* user.friend.remove
+* user.get_friends
+* user.get_messageboard
+* user.get_profile
+* user.get_profile_fields
+* user.get_user_by_email
+* user.list_members
+* user.post_messageboard
+* user.register
+* user.river_short
+* user.save_profile
+* user.search
+* wire.delete_posts
+* wire.get_comments
+* wire.get_image_comments
+* wire.get_posts
+* wire.post_comment
+* wire.post_image_comment
+* wire.save_post
+* facebook.user_login
+* site.notifications_count
+* site.get_notifications
+
+For more details on how to use the API is available at "APIs" folder > "API List.html" file in the repository.

README.md

@@ -7,7 +7,7 @@ class DB_Register_Functions {
     // constructor
     function __construct() {
         $path = elgg_get_plugins_path();
-        include_once $path . 'web_services/lib/DB_connect.php';
+        include_once $path . 'elgg_with_rest_api/lib/DB_connect.php';
 
         $conn = new DB_Connect();
         $this->db = $conn->connect();
@@ -37,7 +37,7 @@ public function storeUser($name, $account, $gcm_regid, $elgg_post, $elgg_message
             $id = mysqli_insert_id($this->db); // last inserted id
             $result = mysqli_query($this->db, "SELECT * FROM gcm_users WHERE id = $id");
             // return user details
-            if (mysql_num_rows($result) > 0) {
+            if (mysqli_num_rows($result) > 0) {
                 return mysqli_fetch_array($result);
             } else {
                 return false;
@@ -67,7 +67,7 @@ public function updateUser($name, $account, $gcm_regid, $elgg_post, $elgg_messag
     {
         $result = mysqli_query($this->db, "UPDATE gcm_users SET name='$name', account='$account', elgg_post='$elgg_post', elgg_message='$elgg_message' WHERE gcm_regid='$gcm_regid'");
 
-        if (mysql_num_rows($result) > 0) {
+        if (mysqli_num_rows($result) > 0) {
             return mysqli_fetch_array($result);;
         } else {
             return false;
@@ -136,7 +136,7 @@ public function updateNewRegId($old_regId, $new_regId)
     public function checkRegId($regId)
     {
         $result = mysqli_query($this->db, "select * FROM gcm_users WHERE gcm_regid = '$regId'");
-        if (mysql_num_rows($result) > 0) {
+        if (mysqli_num_rows($result) > 0) {
             return mysqli_fetch_array($result);
         } else {
             return false;

lib/DB_Register_Functions.php

@@ -10,14 +10,13 @@ public function connect() {
         $con = mysqli_connect($CONFIG->dbhost, $CONFIG->dbuser, $CONFIG->dbpass, $CONFIG->dbname);
         // selecting database
         if (!$con) {
-            error_log("Error: Unable to connect to MySQL." . PHP_EOL);
-            error_log("Debugging errno: " . mysqli_connect_errno() . PHP_EOL);
-            error_log("Debugging error: " . mysqli_connect_error() . PHP_EOL);
+            error_log("[".date(DATE_RFC2822)."] Error: Unable to connect to MySQL." . PHP_EOL, 3, "web_error_log");
+            error_log("[".date(DATE_RFC2822)."] Debugging errno: " . mysqli_connect_errno() . PHP_EOL, 3, "web_error_log");
+            error_log("[".date(DATE_RFC2822)."] Debugging error: " . mysqli_connect_error() . PHP_EOL, 3, "web_error_log");
             exit;
         }
 
         // return database handler
         return $con;
     }
 } 
-

lib/DB_connect.php

@@ -6,7 +6,7 @@ class GCM {
     // constructor
     function __construct() {
         $path = elgg_get_plugins_path();
-        include_once $path.'web_services/lib/DB_Register_Functions.php';
+        include_once $path.'elgg_with_rest_api/lib/DB_Register_Functions.php';
     }
 
     public function setup_message($sender_name, $sender_username, $recipient_name, $recipient_username, $message_sent_title, $message_sent_description)
@@ -55,10 +55,10 @@ public function send_notification($registration_ids, $message) {
 
         if ($message) {
             // include config
-            $GOOGLE_API_KEY = elgg_get_plugin_setting('google_api_key', 'web_services');
+            $GOOGLE_API_KEY = elgg_get_plugin_setting('google_api_key', 'elgg_with_rest_api');
 
             // Set POST variables
-            $url = 'https://android.googleapis.com/gcm/send';
+            $url = 'https://fcm.googleapis.com/fcm/send';
 
             $fields = array(
                 'registration_ids' => $registration_ids,
@@ -86,7 +86,7 @@ public function send_notification($registration_ids, $message) {
 
             // Execute post
             $result = curl_exec($ch);
-            error_log($result);
+            error_log("[".date(DATE_RFC2822). " " . $result . PHP_EOL, 3, "web_error_log");
             if ($result === FALSE) {
                 die('Curl failed: ' . curl_error($ch));
                 return false;
@@ -104,9 +104,9 @@ function removeOldRegId($regId)
         $db = new DB_Register_Functions();
         $result = $db->deleteRegId($regId);
         if ($result) {
-            error_log("Success removed RegId");
+            error_log("[".date(DATE_RFC2822)."] Success removed RegId". PHP_EOL, 3, "web_error_log");
         } else {
-            error_log("Fail to remove RedId");
+            error_log("[".date(DATE_RFC2822)."] Fail to remove RedId". PHP_EOL, 3, "web_error_log");
         }
     }
 
@@ -115,9 +115,9 @@ public function updateRegId($old_regId, $new_regId)
         $db = new DB_Register_Functions();
         $result = $db->updateNewRegId($old_regId, $new_regId);
         if ($result) {
-            error_log("Success updated RegId");
+            error_log("[".date(DATE_RFC2822)."] Success updated RegId". PHP_EOL, 3, "web_error_log");
         } else {
-            error_log("Fail to update RedId");
+            error_log("[".date(DATE_RFC2822)."] Fail to update RedId". PHP_EOL, 3, "web_error_log");
         }
     }
 }

lib/GCM.php

@@ -56,7 +56,7 @@ function get_api_key() {
 }
 
 function get_gcm_sender_id() {
-    $gcm_sender_id = elgg_get_plugin_setting('google_sender_id', 'web_services');
+    $gcm_sender_id = elgg_get_plugin_setting('google_sender_id', 'elgg_with_rest_api');
     if (!$gcm_sender_id) {
         $gcm_sender_id = '';
     }

lib/auth.php

@@ -74,6 +74,8 @@ function blog_get_posts($context, $username, $limit = 10, $offset = 0,$group_gui
             $blog['guid'] = $single->guid;
             $blog['title'] = $single->title;
             $blog['excerpt'] = $single->excerpt;
+            $blog['status'] = $single->status;
+            $blog['link'] = $single->getURL();
 
             if (strlen($single->description) > 300) {
                 $entityString = substr(strip_tags($single->description), 0, 300);
@@ -109,7 +111,7 @@ function blog_get_posts($context, $username, $limit = 10, $offset = 0,$group_gui
             if ($single->tags == null) {
                 $blog['tags'] = '';
             } else {
-                $blog['tags'] = implode(",", $single->tags);
+                $blog['tags'] = $single->tags;
             }
 
             $return[] = $blog;
@@ -331,11 +333,13 @@ function blog_get_post($guid, $username) {
     $return['title'] = htmlspecialchars($blog->title);
     $return['description'] = $blog->description;
     $return['excerpt'] = $blog->excerpt;
+    $return['status'] = $blog->status;
+    $return['link'] = $blog->getURL();
 
     if ($blog->tags == null) {
         $return['tags'] = '';
     } else {
-        $return['tags'] = implode(",", $blog->tags);
+        $return['tags'] = $blog->tags;
     }
 
     $comments = elgg_get_entities(array(

lib/blog.php

@@ -117,7 +117,7 @@ function bookmark_get_posts($context,  $limit = 20, $offset = 0, $username, $fro
             if ($single->tags == null) {
                 $bookmark['tags'] = '';
             } else {
-                $bookmark['tags'] = implode(",", $single->tags);
+                $bookmark['tags'] = $single->tags;
             }
 
             $bookmark['like_count'] = likes_count_number_of_likes($single->guid);
@@ -184,7 +184,7 @@ function bookmark_get_post($guid, $username) {
     if ($bookmark->tags == null) {
         $return['tags'] = '';
     } else {
-        $return['tags'] = implode(",", $bookmark->tags);
+        $return['tags'] = $bookmark->tags;
     }
 
     $comments = elgg_get_entities(array(

lib/bookmark.php

@@ -39,7 +39,7 @@ function site_river_short($username, $limit=20, $offset=0, $from_guid) {
 
     $activities = elgg_get_river($options);
     //$test2 = elgg_list_river($options);
-    //error_log($test2);
+    //error_log($test2, 3, "web_error_log");
 
     $login_user = $user;
     $handle = getRiverActivity($activities, $user, $login_user);
@@ -601,11 +601,74 @@ function getRiverActivity($activities, $user, $login_user) {
             } else {
                 $entityString = '';
             }
-
-        } else {
-            //$isObject = true;
-            //$entityTxt = get_object_entity_as_row($activity->object_guid)->description;
-        }
+		// Custome formatting start here -- Rohit Gupta (30th Dec 2016)
+        } else if ($activity->view == 'river/object/badge/assign' || $activity->view == 'river/object/badge/award') {
+            $isObject = true;
+			$performed_by = $activity->getSubjectEntity();
+			$performed_on = $activity->getObjectEntity();
+			$object = $activity->getObjectEntity();
+
+			if ($guid = $object->badges_badge) {
+				$badge = get_entity($guid);
+				$badge_url = $badge->badges_url;
+
+				if ($badge_url) {
+					$badge_view = "<a href=\"" . $badge_url . "\"><img title=\"" . $badge->title . "\" src=\"" . elgg_add_action_tokens_to_url(elgg_get_site_url() . "action/badges/view?file_guid=" . $badge->guid) . "\"></a>";
+				} else {
+					$badge_view = "<img title=\"" . $badge->title . "\" src=\"" . elgg_add_action_tokens_to_url(elgg_get_site_url() . "action/badges/view?file_guid=" . $badge->guid) . "\">";
+				}
+
+				$url = $performed_by->name;
+				$entityString = elgg_echo('badges:river:assigned', array($url, $badge->title)) . "<br>" . $badge_view;
+				$entityTxt = 'A new Badge was awarded!';
+			}
+		} else if ($activity->view == 'river/event_relationship/create') {
+					$isObject = true;
+					$user = get_entity($activity->subject_guid);
+					$event = get_entity($activity->object_guid);
+
+					$subject_url = "<a href='" . $user->getURL() . "'>" . $user->name . "</a>";
+					$event_url = "<a href='" . $event->getURL() . "'>" . $event->title . "</a>";
+
+					$relationtype = $event->getRelationshipByUser($user->getGUID()); 
+					$entityTxt = "posted a new event!";
+					$entityString = elgg_echo("event_manager:river:event_relationship:create:" . $relationtype, array($subject_url, $event_url));
+		} else if ($activity->view == 'river/object/event/create') {
+					$isObject = true;
+					$object = $activity->getObjectEntity();
+					$entityString = elgg_get_excerpt($object->description);
+					$entityTxt = "created event " . $object->title;
+		} else if ($activity->view == 'river/object/questions/create') {
+					$isObject = true;
+					$object = $activity->getObjectEntity();
+					$entityString = elgg_get_excerpt($object->description);
+					$entityTxt = "asked a new question!";
+		} else if ($activity->view == 'river/relationship/member_of_site/create') {
+					$isObject = true;
+					$object = $activity->getObjectEntity();
+					$entityString = elgg_get_excerpt($object->description);
+					$entityTxt = "joined the site!";
+					
+		} else if ($activity->view == 'river/object/videos/create') {
+					$isObject = true;
+					$object = $activity->getObjectEntity();
+					$excerpt = elgg_get_excerpt($object->description);
+
+					$video_url = $object->video_url;
+
+					$video_url = str_replace("feature=player_embedded&amp;", "", $video_url);
+					$video_url = str_replace("feature=player_detailpage&amp;", "", $video_url);
+					$video_url = str_replace("http://youtu.be","https://www.youtube.be",$video_url);
+					$guid = $object->guid;
+					$entityTxt = "posted a video!";
+					$entityString = $excerpt . "|" . $video_url;
+		} else {
+					$isObject = true;
+					$object = $activity->getObjectEntity();
+					$entityString = elgg_get_excerpt($object->description);
+					$entityTxt = "";
+		}
+		// Custome formatting end here -- Rohit Gupta (30th Dec 2016)
 
         if ($isObject) {
             $handle[] = array(

lib/core.php

@@ -0,0 +1,22 @@
+<?php
+/*
+* View all Events
+* View details of one Events
+* RSVP Events (event_manager/actions/event/rsvp.php)
+* Unsubscribe Events (event_manager/actions/event/unsubscribe.php & event_manager/actions/event/unsubscribe_confirm.php)
+* Post Comment on Event
+* Get Comment on Event
+* Create / Edit an Events (event_manager/views/default/resources/events/event/edit.php)
+ * Add river post when event is created (event_manager/actions/event/edit.php)
+* Add Files to Event (event_manager/actions/event/upload.php)
+* Delete File of Event (event_manager/actions/event/delete.php)
+* Delete an Event (event_manager/actions/event/delete.php)
+* Search an event (event_manager/actions/event/search.php)
+ * Include past events
+ * Advance Search
+* Optional: View event on map
+* Get Direction from current location to Event Location
+*/
+
+
+?>