Commit c2d0b0f6c7877d2ef85c368b1ac632a590d6fa3e
1 parent
a2c64b8b
s/retrieveSubscriptions/retrieveUserSubscriptions/g
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1275 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
2 changed files
with
4 additions
and
4 deletions
presentation/lookAndFeel/knowledgeTree/subscriptions/subscriptionUI.inc
| @@ -19,8 +19,8 @@ function renderManagePage() { | @@ -19,8 +19,8 @@ function renderManagePage() { | ||
| 19 | global $default; | 19 | global $default; |
| 20 | 20 | ||
| 21 | // retrieve subscriptions for this user | 21 | // retrieve subscriptions for this user |
| 22 | - $aFolderSubscriptions = SubscriptionManager::retrieveSubscriptions($_SESSION["userID"], SubscriptionConstants::subscriptionType("FolderSubscription")); | ||
| 23 | - $aDocumentSubscriptions = SubscriptionManager::retrieveSubscriptions($_SESSION["userID"], SubscriptionConstants::subscriptionType("DocumentSubscription")); | 22 | + $aFolderSubscriptions = SubscriptionManager::retrieveUserSubscriptions($_SESSION["userID"], SubscriptionConstants::subscriptionType("FolderSubscription")); |
| 23 | + $aDocumentSubscriptions = SubscriptionManager::retrieveUserSubscriptions($_SESSION["userID"], SubscriptionConstants::subscriptionType("DocumentSubscription")); | ||
| 24 | $bNoSubscriptions = ( (count($aFolderSubscriptions) == 0) && (count($aDocumentSubscriptions) == 0) ) ? true : false; | 24 | $bNoSubscriptions = ( (count($aFolderSubscriptions) == 0) && (count($aDocumentSubscriptions) == 0) ) ? true : false; |
| 25 | 25 | ||
| 26 | $sToRender = "<table>\n"; | 26 | $sToRender = "<table>\n"; |
tests/subscriptions/subscriptionManager.php
| @@ -63,11 +63,11 @@ if (checkSession()) { | @@ -63,11 +63,11 @@ if (checkSession()) { | ||
| 63 | 63 | ||
| 64 | // now try to retrieve them | 64 | // now try to retrieve them |
| 65 | echo "<li>folder subscriptions for userID=$iUserID:"; | 65 | echo "<li>folder subscriptions for userID=$iUserID:"; |
| 66 | - $aFolders = $oSubscriptionManager->retrieveSubscriptions($iUserID, SubscriptionConstants::subscriptionType("FolderSubscription")); | 66 | + $aFolders = $oSubscriptionManager->retrieveUserSubscriptions($iUserID, SubscriptionConstants::subscriptionType("FolderSubscription")); |
| 67 | echo "<pre>" . arrayToString($aFolders) . "</pre></li>"; | 67 | echo "<pre>" . arrayToString($aFolders) . "</pre></li>"; |
| 68 | 68 | ||
| 69 | echo "<li>document subscriptions for userID=$iUserID:"; | 69 | echo "<li>document subscriptions for userID=$iUserID:"; |
| 70 | - $aDocuments = $oSubscriptionManager->retrieveSubscriptions($iUserID, SubscriptionConstants::subscriptionType("DocumentSubscription")); | 70 | + $aDocuments = $oSubscriptionManager->retrieveUserSubscriptions($iUserID, SubscriptionConstants::subscriptionType("DocumentSubscription")); |
| 71 | echo "<pre>" . arrayToString($aDocuments) . "</pre></li>"; | 71 | echo "<pre>" . arrayToString($aDocuments) . "</pre></li>"; |
| 72 | 72 | ||
| 73 | // now try retrieving both | 73 | // now try retrieving both |