Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit cb5973f

Browse files
author
Julien Jomier
committed
STYLE: Fixed style
1 parent bf1484a commit cb5973f

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

core/models/pdo/FeedModel.php

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ class FeedModel extends AppModelPdo
2222
'feedpolicyuser' => array('type'=>MIDAS_ONE_TO_MANY, 'model' => 'Feedpolicyuser', 'parent_column'=> 'feed_id', 'child_column' => 'feed_id'),
2323
);
2424

25-
2625
/** check if the policy is valid
2726
*
2827
* @param FolderDao $folderDao
@@ -80,34 +79,36 @@ function policyCheck($feedDao,$userDao=null,$policy=0)
8079
return true;
8180
}
8281
return false;
83-
}//end policyCheck
82+
} //end policyCheck
8483

8584
/** get feeds (filtered by policies)
8685
* @return Array of FeedDao */
8786
function getGlobalFeeds($loggedUserDao,$policy=0,$limit=20)
8887
{
8988
return $this->_getFeeds($loggedUserDao,null,null,$policy,$limit);
90-
}
89+
} //end getGlobalFeeds
90+
9191
/** get feeds by user (filtered by policies)
9292
* @return Array of FeedDao */
9393
function getFeedsByUser($loggedUserDao,$userDao,$policy=0,$limit=20)
9494
{
9595
return $this->_getFeeds($loggedUserDao,$userDao,null,$policy,$limit);
96-
}
96+
} //end getFeedsByUser
97+
9798
/** get feeds by community (filtered by policies)
9899
* @return Array of FeedDao */
99100
function getFeedsByCommunity($loggedUserDao,$communityDao,$policy=0,$limit=20)
100101
{
101102
return $this->_getFeeds($loggedUserDao,null,$communityDao,$policy,$limit);
102-
}
103+
} //end getFeedsByCommunity
103104

104105
/** get feed
105106
* @param UserDao $loggedUserDao
106107
* @param UserDao $userDao
107108
* @param CommunityDao $communityDao
108109
* @param type $policy
109110
* @param type $limit
110-
* @return type * @return Array of FeedDao */
111+
* @return Array of FeedDao */
111112
private function _getFeeds($loggedUserDao,$userDao=null,$communityDao=null,$policy=0,$limit=20)
112113
{
113114
if($loggedUserDao==null)
@@ -195,7 +196,8 @@ private function _getFeeds($loggedUserDao,$userDao=null,$communityDao=null,$poli
195196
$this->Component->Sortdao->order='asc';
196197
usort($rowsetAnalysed, array($this->Component->Sortdao,'sortByDate'));
197198
return $rowsetAnalysed;
198-
}
199+
} // end _getFeeds
200+
199201
/** Create a feed
200202
* @return FeedDao */
201203
function createFeed($userDao,$type,$ressource,$communityDao=null)
@@ -268,11 +270,11 @@ function createFeed($userDao,$type,$ressource,$communityDao=null)
268270
$this->addCommunity($feed, $communityDao);
269271
}
270272
return $feed;
271-
}
273+
} // end createFeed()
272274

273275

274276
/** Add an item to a community
275-
* @return void*/
277+
* @return void */
276278
function addCommunity($feed,$community)
277279
{
278280
if(!$community instanceof CommunityDao)
@@ -284,12 +286,11 @@ function addCommunity($feed,$community)
284286
throw new Zend_Exception("Should be an feed.");
285287
}
286288
$this->link('communities',$feed,$community);
287-
} // end function addCommunity
289+
} // end addCommunity
288290

289-
/** Delete Dao
290-
*
291-
* @param FeedDao $feeDao
292-
*/
291+
/** Delete Dao
292+
* @param FeedDao $feeDao
293+
*/
293294
function delete($feeDao)
294295
{
295296
$this->ModelLoader = new MIDAS_ModelLoader();
@@ -313,6 +314,7 @@ function delete($feeDao)
313314
parent::removeLink('communities', $feeDao, $c);
314315
}
315316
return parent::delete($feeDao);
316-
}
317+
} // end delete
318+
317319
} // end class
318320
?>

core/models/pdo/UserModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public function save($dao)
123123
throw new Zend_Exception("Use createUser method.");
124124
}
125125

126-
/** create user */
126+
/** create user */
127127
public function createUser($email,$password,$firstname,$lastname,$admin=0)
128128
{
129129
if(!is_string($email)||empty($email)||!is_string($password)||empty($password)||!is_string($firstname)

0 commit comments

Comments
 (0)