[pLog-svn] r2211 - plog/trunk
ork at devel.plogworld.net
ork at devel.plogworld.net
Sun Jun 12 09:53:05 GMT 2005
Author: ork
Date: 2005-06-12 09:53:05 +0000 (Sun, 12 Jun 2005)
New Revision: 2211
Modified:
plog/trunk/xmlrpc.php
Log:
added propper usage of the user API, i would like to get rid of getUserInfo( $user, $pass ) as is should be only getUserInfo( $user ).. we should use authenticateUser( $user, $pass ) whenever we need to auth anyone
Modified: plog/trunk/xmlrpc.php
===================================================================
--- plog/trunk/xmlrpc.php 2005-06-12 09:07:12 UTC (rev 2210)
+++ plog/trunk/xmlrpc.php 2005-06-12 09:53:05 UTC (rev 2211)
@@ -57,12 +57,9 @@
// -mhe todo security
- $erg = $users->getUserInfo(
- $username,
- $password
- );
+ $auth = $users->authenticateUser( $username, $password );
- if ($erg != false)
+ if ($auth)
{
if ($publish)
{
@@ -88,13 +85,13 @@
$content = implode("\n", $dummy);
unset($dummy);
+ $userInfo = $users->getUserInfoFromUsername( $username );
-
$article = new Article(
$title,
$content, // text
$idCategory, // catid
- $erg->_id, // userid
+ $userInfo->getId(), // userid
$blogid, // blogid
$status,
0, // numread
@@ -106,7 +103,7 @@
// Get the plugin manager
$plugMgr =& PluginManager::getPluginManager();
$plugMgr->setBlogInfo( $blogsG->getBlogInfo( $blogid ) );
- $plugMgr->setUserInfo( $erg );
+ $plugMgr->setUserInfo( $userInfo );
$plugMgr->loadPlugins();
// Send the PRE_POST_POST_ADD message
$plugMgr->notifyEvent( EVENT_PRE_POST_ADD, Array( "article" => &$article ));
@@ -143,12 +140,9 @@
// -mhe todo security
- $erg = $users->getUserInfo(
- $username,
- $password
- );
+ $auth = $users->authenticateUser( $username, $password);
- if ($erg != false)
+ if ($auth)
{
if ($publish)
{
@@ -194,12 +188,14 @@
$blogCategory = array_pop( $cats );
$categories[] = $blogCategory->getId();
}
+
+ $userInfo = $users->getUserInfoFromUsername( $username );
$article = new Article(
$title,
$body, // text
$categories, // catid
- $erg->_id, // userid
+ $userInfo->getId(), // userid
$blogid, // blogid
$status,
0, // numread
@@ -229,7 +225,7 @@
// Get the plugin manager
$plugMgr =& PluginManager::getPluginManager();
$plugMgr->setBlogInfo( $blogsG->getBlogInfo( $blogid ) );
- $plugMgr->setUserInfo( $erg );
+ $plugMgr->setUserInfo( $userInfo );
$plugMgr->loadPlugins();
// Send the PRE_POST_POST_ADD message
$plugMgr->notifyEvent( EVENT_PRE_POST_ADD, Array( "article" => &$article ));
@@ -267,12 +263,9 @@
*/
- $erg = $users->getUserInfo(
- $username,
- $password
- );
+ $auth = $users->authenticateUser( $username, $password );
- if ($erg != false)
+ if ($auth)
{
$cats = $category->getBlogCategories($blogid);
$ret = array();
@@ -313,10 +306,12 @@
"postid" =>
*/
- $erg = $users->getUserInfo($username,$password);
- if ($erg != false)
+ $auth = $users->getUserInfo($username,$password);
+ if ($auth)
{
- $item = $articles->getUserArticle($postid, $erg->_id);
+ $userInfo = $users->getUserInfoFromUsername( $username );
+
+ $item = $articles->getUserArticle( $postid, $userInfo->getId() );
$time = mktime(
substr($item->_date,8,2),
substr($item->_date,10,2),
@@ -352,10 +347,13 @@
"postid" =>
*/
- $erg = $users->getUserInfo($username,$password);
- if ($erg != false)
+ $auth = $users->authenticateUser($username,$password);
+
+ if ($auth)
{
- $item = $articles->getUserArticle($postid, $erg->_id);
+ $userInfo = $users->getUserInfoFromUsername( $username );
+
+ $item = $articles->getUserArticle( $postid, $userInfo->getId() );
$time = mktime(
substr($item->_date,8,2),
substr($item->_date,10,2),
@@ -409,9 +407,11 @@
boolean, true or false
*/
- $erg = $users->getUserInfo($username,$password);
- if ($erg != false)
+ $auth = $users->authenticateUser($username,$password);
+ if ($auth)
{
+ $userInfo = $users->getUserInfoFromUsername( $username );
+
if ($publish)
{
$status = POST_STATUS_PUBLISHED;
@@ -435,7 +435,7 @@
// Get the plugin manager
$plugMgr =& PluginManager::getPluginManager();
$plugMgr->setBlogInfo( $blogsG->getBlogInfo( $article->getBlog() ) );
- $plugMgr->setUserInfo( $erg );
+ $plugMgr->setUserInfo( $userInfo );
$plugMgr->loadPlugins();
// Send the EVENT_PRE_POST_UPDATE message
$plugMgr->notifyEvent( EVENT_PRE_POST_UPDATE, Array( "article" => &$article ));
@@ -468,9 +468,11 @@
boolean, true or false
*/
- $erg = $users->getUserInfo($username,$password);
- if ($erg != false)
+ $auth = $users->getUserInfo($username,$password);
+ if ($auth)
{
+ $userInfo = $users->getUserInfoFromUsername( $username );
+
if ($publish)
{
$status = POST_STATUS_PUBLISHED;
@@ -517,7 +519,7 @@
// Get the plugin manager
$plugMgr =& PluginManager::getPluginManager();
$plugMgr->setBlogInfo( $blogsG->getBlogInfo( $blogid ) );
- $plugMgr->setUserInfo( $erg );
+ $plugMgr->setUserInfo( $userInfo );
$plugMgr->loadPlugins();
// Send the EVENT_PRE_POST_UPDATE message
$plugMgr->notifyEvent( EVENT_PRE_POST_UPDATE, Array( "article" => &$article ));
@@ -547,23 +549,24 @@
$publish = $args[4];
// -mhe todo
- $erg = $users->getUserInfo($username,$password);
- if ($erg != false)
+ $auth = $users->getUserInfo($username,$password);
+ if ($auth)
{
+ $userInfo = $users->getUserInfoFromUsername( $username );
- $article = $articles->getUserArticle($postid, $erg->_id);
+ $article = $articles->getUserArticle($postid, $userInfo->getId());
// Get the plugin manager
$plugMgr =& PluginManager::getPluginManager();
$plugMgr->setBlogInfo( $blogsG->getBlogInfo( $article->getBlog() ) );
- $plugMgr->setUserInfo( $erg );
+ $plugMgr->setUserInfo( $userInfo );
$plugMgr->loadPlugins();
// Send the EVENT_PRE_POST_DELETE message
$plugMgr->notifyEvent( EVENT_PRE_POST_DELETE, Array( "article" => &$article ));
$articles->deleteArticle(
$postid,
- $erg->_id, // userid
+ $userInfo->getId(), // userid
$article->getBlog(),
$forever = true // kick 4eva
);
@@ -595,8 +598,8 @@
$password = $args[3];
$number = $args[4];
- $erg = $users->getUserInfo($username,$password);
- if ($erg != false)
+ $auth = $users->getUserInfo($username,$password);
+ if ($auth)
{
$ret = array();
$list = $articles->getBlogArticles(
@@ -645,8 +648,9 @@
$password = $args[2];
$number = $args[3];
- $erg = $users->getUserInfo($username,$password);
- if ($erg != false)
+ $auth = $users->getUserInfo($username,$password);
+
+ if ($auth)
{
$ret = array();
$list = $articles->getBlogArticles(
@@ -711,8 +715,8 @@
$password = $args[2];
$file = $args[3];
- $erg = $users->getUserInfo($username,$password);
- if ($erg != false)
+ $auth = $users->getUserInfo($username,$password);
+ if ($auth)
{
// Save this file to the tmp directory
@@ -791,19 +795,18 @@
$users = new Users();
- $erg = $users->getUserInfo(
- $username,
- $password
- );
+ $auth = $users->getUserInfo( $username, $password );
- if ($erg != false)
+ if ($auth)
{
+ $userInfo = $users->getUserInfoFromUsername( $username );
+
$ret = array();
- $ret["nickname"] = $erg["_username"];
- $ret["firstname"] = $erg["_username"];
+ $ret["nickname"] = $userInfo->getUsername();
+ $ret["firstname"] = $userInfo->getUsername();
$ret["lastname"] = "";
- $ret["email"] = $erg["_email"];
- $ret["userid"] = $erg["_id"];
+ $ret["email"] = $userInfo->getEmail();
+ $ret["userid"] = $userInfo->getId();
$ret["url"] = "";
return $ret;
} else
@@ -824,14 +827,13 @@
"blogid" =>
*/
- $erg = $users->getUserInfo(
- $username,
- $password
- );
+ $auth = $users->getUserInfo( $username, $password );
- if ($erg != false)
+ if ($auth)
{
- $blogs = $users->getUsersBlogs($erg->_id);
+ $userInfo = $users->getUserInfoFromUsername( $username );
+
+ $blogs = $users->getUsersBlogs($userInfo->getId());
$ret = array();
foreach($blogs as $blog)
{
More information about the pLog-svn
mailing list