Commit 22afe27822b2f408c89e0f54b9c13d9fbbfeb011
1 parent
bbb0b8da
Added webservice functionality for subscriptions
Committed By: Kevin Cyster Reviewed By: Megan Watson
Showing
1 changed file
with
26 additions
and
10 deletions
ktapi/KTAPIFolder.inc.php
| @@ -1169,7 +1169,8 @@ class KTAPI_Folder extends KTAPI_FolderItem | @@ -1169,7 +1169,8 @@ class KTAPI_Folder extends KTAPI_FolderItem | ||
| 1169 | $user = $this->ktapi->get_user(); | 1169 | $user = $this->ktapi->get_user(); |
| 1170 | $folder = $this->folder; | 1170 | $folder = $this->folder; |
| 1171 | 1171 | ||
| 1172 | - return Subscription::exists($user->getId(), $folder->getId(), $subscriptionType); | 1172 | + $result = Subscription::exists($user->getId(), $folder->getId(), $subscriptionType); |
| 1173 | + return $result; | ||
| 1173 | } | 1174 | } |
| 1174 | 1175 | ||
| 1175 | /** | 1176 | /** |
| @@ -1182,7 +1183,7 @@ class KTAPI_Folder extends KTAPI_FolderItem | @@ -1182,7 +1183,7 @@ class KTAPI_Folder extends KTAPI_FolderItem | ||
| 1182 | { | 1183 | { |
| 1183 | if (!$this->isSubscribed()) | 1184 | if (!$this->isSubscribed()) |
| 1184 | { | 1185 | { |
| 1185 | - return; | 1186 | + return TRUE; |
| 1186 | } | 1187 | } |
| 1187 | 1188 | ||
| 1188 | $subscriptionType = SubscriptionEvent::subTypes('Folder'); | 1189 | $subscriptionType = SubscriptionEvent::subTypes('Folder'); |
| @@ -1190,7 +1191,16 @@ class KTAPI_Folder extends KTAPI_FolderItem | @@ -1190,7 +1191,16 @@ class KTAPI_Folder extends KTAPI_FolderItem | ||
| 1190 | $folder = $this->folder; | 1191 | $folder = $this->folder; |
| 1191 | 1192 | ||
| 1192 | $subscription = & Subscription::getByIDs($user->getId(), $folder->getId(), $subscriptionType); | 1193 | $subscription = & Subscription::getByIDs($user->getId(), $folder->getId(), $subscriptionType); |
| 1193 | - $subscription->delete(); | 1194 | + $result = $subscription->delete(); |
| 1195 | + | ||
| 1196 | + if(PEAR::isError($result)){ | ||
| 1197 | + return $result->getMessage(); | ||
| 1198 | + } | ||
| 1199 | + if($result){ | ||
| 1200 | + return $result; | ||
| 1201 | + } | ||
| 1202 | + | ||
| 1203 | + return $_SESSION['errorMessage']; | ||
| 1194 | } | 1204 | } |
| 1195 | 1205 | ||
| 1196 | /** | 1206 | /** |
| @@ -1204,17 +1214,23 @@ class KTAPI_Folder extends KTAPI_FolderItem | @@ -1204,17 +1214,23 @@ class KTAPI_Folder extends KTAPI_FolderItem | ||
| 1204 | { | 1214 | { |
| 1205 | if ($this->isSubscribed()) | 1215 | if ($this->isSubscribed()) |
| 1206 | { | 1216 | { |
| 1207 | - return; | 1217 | + return TRUE; |
| 1208 | } | 1218 | } |
| 1209 | - | ||
| 1210 | - $subscriptionType = SubscriptionEvent::subTypes('Folder '); | 1219 | + $subscriptionType = SubscriptionEvent::subTypes('Folder'); |
| 1211 | $user = $this->ktapi->get_user(); | 1220 | $user = $this->ktapi->get_user(); |
| 1212 | $folder = $this->folder; | 1221 | $folder = $this->folder; |
| 1213 | 1222 | ||
| 1214 | $subscription = new Subscription($user->getId(), $folder->getId(), $subscriptionType); | 1223 | $subscription = new Subscription($user->getId(), $folder->getId(), $subscriptionType); |
| 1215 | - $subscription->create(); | ||
| 1216 | - } | 1224 | + $result = $subscription->create(); |
| 1217 | 1225 | ||
| 1218 | -} | 1226 | + if(PEAR::isError($result)){ |
| 1227 | + return $result->getMessage(); | ||
| 1228 | + } | ||
| 1229 | + if($result){ | ||
| 1230 | + return $result; | ||
| 1231 | + } | ||
| 1219 | 1232 | ||
| 1220 | -?> | 1233 | + return $_SESSION['errorMessage']; |
| 1234 | + } | ||
| 1235 | +} | ||
| 1236 | +?> | ||
| 1221 | \ No newline at end of file | 1237 | \ No newline at end of file |