This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via ac3d4e3260233dedac0e2ed6d2358b0668548c99 (commit)
from b46207fff535ebdec42789050ca52d5a84f8e85c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=ac3d4e3260233dedac0e2ed6d2358b0668548c99
commit ac3d4e3260233dedac0e2ed6d2358b0668548c99
Author: Franck Villaume <[email protected]>
Date: Fri Jun 17 13:32:39 2016 +0200
Rename GFUser to FFUser.
diff --git a/src/bin/inject-users.php b/src/bin/inject-users.php
index 6c4587d..713365d 100755
--- a/src/bin/inject-users.php
+++ b/src/bin/inject-users.php
@@ -47,7 +47,7 @@ while (! feof ($f)) {
$lname = $array[3] ;
$password = $array[4] ;
- $u = new GFUser () ;
+ $u = new FFUser () ;
$r = $u->create ($login, $fname, $lname, $password, $password, $email,
1, 0, 1, 'UTC', '', '',
getThemeIdFromName(forge_get_config('default_theme')),
diff --git a/src/common/forum/ForumMessage.class.php
b/src/common/forum/ForumMessage.class.php
index d219a11..097b51f 100644
--- a/src/common/forum/ForumMessage.class.php
+++ b/src/common/forum/ForumMessage.class.php
@@ -649,7 +649,7 @@ class ForumMessage extends FFError {
}
foreach ($recipients as $recipient) {
- if ($recipient instanceof GFUser) {
+ if ($recipient instanceof FFUser) {
setup_gettext_for_user ($recipient) ;
$dest_email = $recipient->getEmail ();
} else {
diff --git a/src/common/include/AuthPlugin.class.php
b/src/common/include/AuthPlugin.class.php
index 0445e2c..85bfffe 100644
--- a/src/common/include/AuthPlugin.class.php
+++ b/src/common/include/AuthPlugin.class.php
@@ -41,7 +41,7 @@ abstract class ForgeAuthPlugin extends Plugin {
$this->Plugin();
// Common hooks that can be enabled per plugin:
// check_auth_session - is there a valid session?
- // fetch_authenticated_user - what GFUser is logged in?
+ // fetch_authenticated_user - what FFUser is logged in?
// display_auth_form - display a form to input credentials
// display_create_user_form - display a form to create a user
from external auth
// sync_account_info - sync identity from external source
(realname, email, etc.)
@@ -95,7 +95,7 @@ abstract class ForgeAuthPlugin extends Plugin {
/**
* Current forge user
*
- * @var object GFUser
+ * @var object FFUser
*/
protected $saved_user;
@@ -131,7 +131,7 @@ abstract class ForgeAuthPlugin extends Plugin {
}
/**
- * What GFUser is logged in?
+ * What FFUser is logged in?
*
* This will generate a valid forge user (by default, it was generated
and cached already in saved_user)
*
diff --git a/src/common/include/User.class.php
b/src/common/include/User.class.php
index 3bec0df..4539e2a 100644
--- a/src/common/include/User.class.php
+++ b/src/common/include/User.class.php
@@ -36,7 +36,7 @@ $USER_OBJ = array();
*
* @param string $user_name The unix username - required
* @param bool|int $res The result set handle ("SELECT * FROM USERS
WHERE user_id=xx")
- * @return GFUser User object or false on failure
+ * @return FFUser User object or false on failure
*/
function &user_get_object_by_name($user_name, $res = false) {
$user_name = strtolower($user_name);
@@ -53,7 +53,7 @@ function &user_get_object_by_name($user_name, $res = false) {
*
* @param string $email The unix username - required
* @param bool|int $res The result set handle ("SELECT * FROM USERS WHERE
user_id=xx")
- * @return GFUser User object or false on failure
+ * @return FFUser User object or false on failure
*/
function user_get_object_by_email($email, $res = false) {
if (!validate_email($email)
@@ -97,7 +97,7 @@ function &user_get_object_by_name_or_email($user_name, $res =
false) {
*
* @param int $user_id The ID of the user - required
* @param int|bool $res The result set handle ("SELECT * FROM USERS WHERE
user_id=xx")
- * @return GFUser a user object or false on failure
+ * @return FFUser a user object or false on failure
*/
function &user_get_object($user_id, $res = false) {
//create a common set of group objects
@@ -117,7 +117,7 @@ function &user_get_object($user_id, $res = false) {
if (!$res || db_numrows($res) < 1) {
$USER_OBJ["_".$user_id."_"] = false;
} else {
- $USER_OBJ["_".$user_id."_"] = new GFUser($user_id,
$res);
+ $USER_OBJ["_".$user_id."_"] = new FFUser($user_id,
$res);
}
}
return $USER_OBJ["_".$user_id."_"];
@@ -125,7 +125,7 @@ function &user_get_object($user_id, $res = false) {
/**
* @param $id_arr
- * @return GFUser[]
+ * @return FFUser[]
*/
function &user_get_objects($id_arr) {
global $USER_OBJ;
@@ -144,7 +144,7 @@ function &user_get_objects($id_arr) {
$res = db_query_params('SELECT * FROM users WHERE user_id = ANY
($1)',
array(db_int_array_to_any_clause($fetch)));
while ($arr = db_fetch_array($res)) {
- $USER_OBJ["_".$arr['user_id']."_"] = new
GFUser($arr['user_id'], $arr);
+ $USER_OBJ["_".$arr['user_id']."_"] = new
FFUser($arr['user_id'], $arr);
}
}
foreach ($id_arr as $id) {
@@ -155,7 +155,7 @@ function &user_get_objects($id_arr) {
/**
* @param string $username_arr
- * @return GFUser[]
+ * @return FFUser[]
*/
function &user_get_objects_by_name($username_arr) {
$res = db_query_params('SELECT user_id FROM users WHERE
lower(user_name) = ANY ($1)',
@@ -166,7 +166,7 @@ function &user_get_objects_by_name($username_arr) {
/**
* @param string $email_arr
- * @return GFUser[]
+ * @return FFUser[]
*/
function &user_get_objects_by_email($email_arr) {
$res = db_query_params('SELECT user_id FROM users WHERE lower(email) =
ANY ($1)',
@@ -178,7 +178,7 @@ function &user_get_objects_by_email($email_arr) {
/**
* user_get_active_users - Return the list of active users.
*
- * @return GFUser[]
+ * @return FFUser[]
*/
function &user_get_active_users() {
$res = db_query_params('SELECT user_id FROM users WHERE status=$1',
@@ -192,7 +192,7 @@ function &user_get_all_users() {
return user_get_objects (util_result_column_to_array($res,0)) ;
}
-class GFUser extends FFError {
+class FFUser extends FFError {
/**
* Associative array of data from db.
*
@@ -545,7 +545,7 @@ Use one below, but make sure it is entered as the single
line.)
}
/**
- * update() - update *common* properties of GFUser object.
+ * update() - update *common* properties of FFUser object.
*
* Use specific setter to change other properties.
*
@@ -662,7 +662,7 @@ Use one below, but make sure it is entered as the single
line.)
$res = db_query_params('SELECT * FROM users WHERE user_id=$1',
array($user_id));
if (!$res || db_numrows($res) < 1) {
- $this->setError('GFUser: '.db_error());
+ $this->setError('FFUser: '.db_error());
return false;
}
$this->data_array = db_fetch_array($res);
diff --git a/src/common/include/UserManager.class.php
b/src/common/include/UserManager.class.php
index 2bf758e..343ac1d 100644
--- a/src/common/include/UserManager.class.php
+++ b/src/common/include/UserManager.class.php
@@ -42,7 +42,7 @@ class UserManager {
*/
function getCurrentUser($session_hash = '') {
if (!session_get_user()) {
- return new GFUser();
+ return new FFUser();
}
return session_get_user();
}
diff --git a/src/common/pm/ProjectTasksForUser.class.php
b/src/common/pm/ProjectTasksForUser.class.php
index 96a526f..4ddc1e0 100644
--- a/src/common/pm/ProjectTasksForUser.class.php
+++ b/src/common/pm/ProjectTasksForUser.class.php
@@ -40,7 +40,7 @@ class ProjectTasksForUser extends FFError {
/**
* ProjectTasksForUser - Creates a new ProjectTasksForUser object
*
- * @param GFUser $user the User object
+ * @param FFUser $user the User object
* @return bool
*/
function ProjectTasksForUser(&$user) {
diff --git a/src/docs/README.Plugins b/src/docs/README.Plugins
index bca282a..631c1b6 100644
--- a/src/docs/README.Plugins
+++ b/src/docs/README.Plugins
@@ -223,8 +223,8 @@ had been written.
Description: Called before checking if the user is logged in by
reading session cookie.
You can use this hook to handle session setup specific
- to your plugin.
-
+ to your plugin.
+
Hook Name : session_set_return
Locations : common/include/session.php
Description: Called after checking if the user is logged in by reading
@@ -237,7 +237,7 @@ had been written.
Locations : www/tracker/detail.php
www/tracker/mod-limited.php
www/tracker/mod.php
- Description: Use this hook to provide additional information about a
+ Description: Use this hook to provide additional information about a
tracker item based upon its ID.
Hook Name : before_logout_redirect
@@ -265,7 +265,7 @@ had been written.
Hook Name : groupisactivecheckboxpost
Parameters : group_id - The numeric ID of the group
Locations : www/project/admin/index.php
- Description: Called when a plugin is activated for a specific group from
+ Description: Called when a plugin is activated for a specific group from
the group's Edit Public Info page. Use this to perform
actions to initialise the plugin for a specific group.
@@ -274,7 +274,7 @@ had been written.
Locations : www/project/admin/index.php
Description: Used to display a portion of a form on a group's Edit
Public Info page. It should return a HTML <tr> line containing
- two cells.
+ two cells.
Hook Name : groupmenu
Parameters : DIRS - A reference to the array of tab URLs
@@ -344,7 +344,7 @@ had been written.
Hook Name : project_after_description
Parameters : group_id - The numeric ID of the group
Locations : www/include/project_home.php
- Description: Provides some space for plugin specific text on a group's
+ Description: Provides some space for plugin specific text on a group's
summary page.
Hook Name : project_public_area
@@ -385,7 +385,7 @@ had been written.
Description: This is used by GForge to identify SCM plugins. Any plugin that
provides SCM features should add itself to the scm_plugins array
when this hook is called.
-
+
Hook Name : scm_stats
Parameters : group_id - The numeric ID of the group
Locations : www/include/project_home.php
@@ -400,7 +400,7 @@ had been written.
Locations : common/include/session.php
Description: Authentication plugins can use this hook to authenticate
a user before GForge passes the authentication details on
- to its own database. The hook should return true if the
+ to its own database. The hook should return true if the
authentication succeeds.
Hook Name : site_admin_option_hook
@@ -414,14 +414,14 @@ had been written.
Locations : www/admin/index.php
Description: Use this to provide a link to the project maintenance pages
for your plugin. The hook should obey the
plugin_hook_by_reference()
- protocol and concatenate a <li> HTML block to params['result']
so
+ protocol and concatenate a <li> HTML block to params['result']
so
that it can appear in the "Plugins Project Maintenance"
subsection
Hook Name : site_admin_user_maintenance_hook
Locations : www/admin/index.php
Description: Use this to provide a link to the user maintenance pages
for your plugin. The hook should obey the
plugin_hook_by_reference()
- protocol and concatenate a <li> HTML block to params['result']
so
+ protocol and concatenate a <li> HTML block to params['result']
so
that it can appear in the "Plugins User Maintenance" subsection
Hook Name : task_extra_detail
@@ -431,7 +431,7 @@ had been written.
Description: Provides a place to include extra information about a
task. The hook should return a <tr> row containing 2 cells
(or colspan'ed to 2).
-
+
Hook Name : usermenu
Locations : www/include/html.php
Description: Prints out a tab to show when displaying user pages.
@@ -488,12 +488,12 @@ TODO : document Auth plugins :
Hook Name : fetch_authenticated_user
Parameters : ??
Locations : common/include/session.php
- Description: what GFUser is logged in?
+ Description: what FFUser is logged in?
it returns a user object in passed $params['results']
Hook Name : widgets
Parameters : $params['owner_type'] == WidgetLayoutManager::OWNER_TYPE_GROUP
or WidgetLayoutManager::OWNER_TYPE_USER
- Description: appends to $params['fusionforge_widgets'] (or
'codendi_widgets') names
+ Description: appends to $params['fusionforge_widgets'] (or
'codendi_widgets') names
of widgets it provides depending on the project home
or user home context
Hook Name : widget_instance
@@ -502,26 +502,26 @@ TODO : document Auth plugins :
Hook Name : script_accepted_types
Parameters : $params['script'] == 'project_home' or 'user_home' depending on
whether providing alternate accept types for such pages
- Description: appends to $params['accepted_types'] alternate HTTP Accept
Content-types supported by a plugin for the
+ Description: appends to $params['accepted_types'] alternate HTTP Accept
Content-types supported by a plugin for the
/projects or /users/ pages rendered through content-negociation
Hook Name : content_negociated_project_home
Parameters : $params['accept'] provides the content-type to be rendered,
$params['groupname'] the project name, $params['group_id'] the project ID
- Description: returns in $params['content'] an alternate content for
/projects/ page and
+ Description: returns in $params['content'] an alternate content for
/projects/ page and
in $params['content_type'] the actual content-type to return
Hook Name : content_negociated_user_home
Parameters : $params['accept'] provides the content-type to be rendered,
$params['username'] the user name
- Description: returns in $params['content'] an alternate content for /users/
page and
+ Description: returns in $params['content'] an alternate content for /users/
page and
in $params['content_type'] the actual content-type to return
Hook Name : project_rdf_metadata
- Parameters : $params['prefixes'] : already used RDF prefixes in the form URL
=> shortname,
+ Parameters : $params['prefixes'] : already used RDF prefixes in the form URL
=> shortname,
$hook_params['group'] : group_id of the project,
$hook_params['in_Resource'] : (read-only) ARC2
resource already available,
$hook_params['details'] : 'full' or 'minimal'
whether requesting a detailed or minimal description
- $hook_params['out_Resources'] : (write) to be
returned the new ARC2 resource
- Description: returns in $params['prefixes'] and $params['out_Resources']
added prefixes and ARC2 RDF resource to be included in the project's DOAP
description
+ $hook_params['out_Resources'] : (write) to be
returned the new ARC2 resource
+ Description: returns in $params['prefixes'] and $params['out_Resources']
added prefixes and ARC2 RDF resource to be included in the project's DOAP
description
Hook Name : role_adduser
Parameters : $params['user'] : user added to the role, $params['role'] :
role added to the user
@@ -535,11 +535,11 @@ TODO : document Auth plugins :
Hook Name : alt_representations
Parameters : $params['script_name'] contains the SCRIPT_NAME (filtered to
work only on /projects or /users for the moment)
- Description: returns alternate representations for a particular page in
$params['results'] which is populated by the hook users
+ Description: returns alternate representations for a particular page in
$params['results'] which is populated by the hook users
Hook Name : content_negociated_projects_list
Parameters : $params['accept'] provides the content-type to be rendered
- Description: returns in $params['content'] an alternate content for
/projects page and
+ Description: returns in $params['content'] an alternate content for
/projects page and
in $params['content_type'] the actual content-type to return
Hook Name : softwaremap_links
@@ -551,7 +551,7 @@ TODO : document Auth plugins :
Hook Name : content_negociated_trove_list
Parameters : $params['accept'] provides the content-type to be rendered
- Description: returns in $params['content'] an alternate content for
/softwaremap/trove_list.php page and
+ Description: returns in $params['content'] an alternate content for
/softwaremap/trove_list.php page and
in $params['content_type'] the actual content-type to return
Hook Name : content_negociated_frs_index
@@ -566,7 +566,7 @@ TODO : document Auth plugins :
TODO (nerville) : document display_hierarchy
-TODO (lolando ?) : document role_normalize, role_translate_strings,
role_has_permission, role_get_setting, list_roles_by_permission
+TODO (lolando ?) : document role_normalize, role_translate_strings,
role_has_permission, role_get_setting, list_roles_by_permission
TODO : document project_link_with_tooltip
-- Roland Mas <[email protected]>
diff --git a/src/plugins/authcas/common/AuthCASPlugin.class.php
b/src/plugins/authcas/common/AuthCASPlugin.class.php
index 991ef96..454b1ac 100644
--- a/src/plugins/authcas/common/AuthCASPlugin.class.php
+++ b/src/plugins/authcas/common/AuthCASPlugin.class.php
@@ -145,7 +145,7 @@ server.");
}
/**
- * What GFUser is logged in?
+ * What FFUser is logged in?
* @param unknown_type $params
*/
function fetchAuthUser(&$params) {
diff --git a/src/plugins/authhttpd/common/AuthHTTPDPlugin.class.php
b/src/plugins/authhttpd/common/AuthHTTPDPlugin.class.php
index f9bef9c..631c7e4 100644
--- a/src/plugins/authhttpd/common/AuthHTTPDPlugin.class.php
+++ b/src/plugins/authhttpd/common/AuthHTTPDPlugin.class.php
@@ -114,7 +114,7 @@ FusionForge, for instance where Kerberos is used.");
}
/**
- * What GFUser is logged in?
+ * What FFUser is logged in?
* @param unknown_type $params
*/
function fetchAuthUser(&$params) {
diff --git a/src/plugins/authldap/common/AuthLDAPPlugin.class.php
b/src/plugins/authldap/common/AuthLDAPPlugin.class.php
index a3f96f4..7909019 100644
--- a/src/plugins/authldap/common/AuthLDAPPlugin.class.php
+++ b/src/plugins/authldap/common/AuthLDAPPlugin.class.php
@@ -78,7 +78,7 @@ into the FusionForge database.");
if (!$u) {
// No user by that name yet, let's create it
- $u = new GFUser();
+ $u = new FFUser();
$user_data = array();
@@ -189,7 +189,7 @@ into the FusionForge database.");
$u->usesTooltips(),
trim($mapped_data['email']));
- if ((substr($mapped_data['unix_password'], 0, 7) == '{crypt}')
+ if ((substr($mapped_data['unix_password'], 0, 7) == '{crypt}')
|| substr($mapped_data['unix_password'], 0, 7) ==
'{CRYPT}') {
$mapped_data['unix_password'] =
substr($mapped_data['unix_password'],7);
}
diff --git a/src/plugins/projectimport/www/usersimport.php
b/src/plugins/projectimport/www/usersimport.php
index 31645da..2f103ac 100644
--- a/src/plugins/projectimport/www/usersimport.php
+++ b/src/plugins/projectimport/www/usersimport.php
@@ -207,7 +207,7 @@ class UsersImportPage extends FileManagerPage {
$password2 = $password1;
$language_id = language_name_to_lang_id
(choose_language_from_context ());
- $new_user = new GFUser();
+ $new_user = new FFUser();
$res =
$new_user->create($unix_name,$firstname,$lastname,$password1,$password2,
$email,$mail_site,$mail_va,$language_id,$timezone,'',0,$theme_id,'',
$address,$address2,$phone,$fax,$title,$ccode,$send_mail);
diff --git a/src/plugins/scmgit/common/GitPlugin.class.php
b/src/plugins/scmgit/common/GitPlugin.class.php
index 7bb949c..6559bb7 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -1016,7 +1016,7 @@ control over it to the project's administrator.");
$result['ref_id'] =
'browser.php?group_id='.$group_id.'&commit='.$splitedLine[3];
$result['description'] =
htmlspecialchars($splitedLine[2]).' (commit '.$splitedLine[3].')';
$userObject =
user_get_object_by_email($splitedLine[1]);
- if (is_a($userObject, 'GFUser')) {
+ if (is_a($userObject, 'FFUser')) {
$result['realname'] =
util_display_user($userObject->getUnixName(), $userObject->getID(),
$userObject->getRealName());
} else {
$result['realname'] = '';
diff --git a/src/plugins/scmhg/common/HgPlugin.class.php
b/src/plugins/scmhg/common/HgPlugin.class.php
index 512a618..924c9c1 100644
--- a/src/plugins/scmhg/common/HgPlugin.class.php
+++ b/src/plugins/scmhg/common/HgPlugin.class.php
@@ -623,7 +623,7 @@ Offer DAV or SSH access.");
$result['ref_id'] =
'browser.php?group_id='.$group_id.'&commit='.$splitedLine[3];
$result['description'] =
htmlspecialchars($splitedLine[2]).' (changeset '.$splitedLine[3].')';
$userObject =
user_get_object_by_email($splitedLine[1]);
- if (is_a($userObject,
'GFUser')) {
+ if (is_a($userObject,
'FFUser')) {
$result['realname'] =
util_display_user($userObject->getUnixName(), $userObject->getID(),
$userObject->getRealName());
} else {
$result['realname'] =
'';
diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php
b/src/plugins/scmsvn/common/SVNPlugin.class.php
index df41d55..15438c7 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -618,7 +618,7 @@ some control over it to the project's administrator.");
$result['ref_id'] =
'browser.php?group_id='.$group_id;
$result['description'] =
htmlspecialchars($message).' (r'.$revisions[$i].')';
$userObject =
user_get_object_by_name($users[$i]);
- if (is_a($userObject, 'GFUser')) {
+ if (is_a($userObject, 'FFUser')) {
$result['realname'] =
util_display_user($userObject->getUnixName(), $userObject->getID(),
$userObject->getRealName());
} else {
$result['realname'] = '';
diff --git a/src/www/account/register.php b/src/www/account/register.php
index 1c3db4b..6d933b0 100644
--- a/src/www/account/register.php
+++ b/src/www/account/register.php
@@ -94,7 +94,7 @@ if (getStringFromRequest('submit')) {
$activate_immediately = false;
}
- $new_user = new GFUser();
+ $new_user = new FFUser();
$register =
$new_user->create($unix_name,$firstname,$lastname,$password1,$password2,
$email,$mail_site,$mail_va,$language_id,$timezone,'',0,$theme_id,'',
$address,$address2,$phone,$fax,$title,$ccode,$send_mail);
diff --git a/src/www/admin/globalroleedit.php b/src/www/admin/globalroleedit.php
index 73f5105..99f3c94 100644
--- a/src/www/admin/globalroleedit.php
+++ b/src/www/admin/globalroleedit.php
@@ -100,7 +100,7 @@ if (getStringFromRequest('adduser')) {
if ($role instanceof RoleExplicit) {
$user_name = getStringFromRequest ('form_unix_name') ;
$u = user_get_object_by_name ($user_name) ;
- if ($u && $u instanceof GFUser && !$u->isError()) {
+ if ($u && $u instanceof FFUser && !$u->isError()) {
if ($role->addUser ($u)) {
$feedback .= _('User Added Successfully') ;
} else {
@@ -122,7 +122,7 @@ if (getStringFromRequest('dormusers')) {
$rmlist = getArrayFromRequest('rmusers');
foreach ($rmlist as $user_id) {
$u = user_get_object ($user_id) ;
- if ($u && $u instanceof GFUser && !$u->isError()) {
+ if ($u && $u instanceof FFUser && !$u->isError()) {
if ($role->removeUser ($u)) {
$feedback .= sprintf(
_('User %s removed successfully') .
"\n",
diff --git a/src/www/export/rssAboTask.php b/src/www/export/rssAboTask.php
index 07130a6..efb5287 100644
--- a/src/www/export/rssAboTask.php
+++ b/src/www/export/rssAboTask.php
@@ -158,7 +158,7 @@ function writeRssFeedItem($objProjectTask, $updates) {
foreach($updates as $update){
$update[6]==='message' ? $title = _('Comment') : $title = $update[5];
$update[6]==='message' ? $description = $update[5] : $description =
$update[6];
- $objGfUser = user_get_object($update[7]);
+ $objFfUser = user_get_object($update[7]);
print'<item>';
print'<title>';
print $title;
@@ -167,13 +167,13 @@ function writeRssFeedItem($objProjectTask, $updates) {
print _('Updated value')._(': ');
print $description.' | ';
print _('Posted by')._(': ');
- print $objGfUser->getUnixName().' | ';
+ print $objFfUser->getUnixName().' | ';
print _('Update time')._(': ');
print gmdate('D, d M Y G:i:s',$update[8]);
print'</description>';
print '<link>' . util_make_url("/pm/t_follow.php/" .
$objProjectTask->getID()) . '</link>';
print'<author>';
- print $objGfUser->getEmail();
+ print $objFfUser->getEmail();
print'</author>';
print '<guid isPermaLink="true">' .
util_make_url("/export/rssAboTask.php?tid=" . $objProjectTask->getID()) .
'</guid>';
print'<pubDate>';
diff --git a/src/www/soap/common/user.php b/src/www/soap/common/user.php
index 8cad6df..8308213 100644
--- a/src/www/soap/common/user.php
+++ b/src/www/soap/common/user.php
@@ -242,7 +242,7 @@ function getUsersByName($session_ser,$user_names) {
//add user object
function addUser($unix_name,$firstname,$lastname,$password1,$password2,$email,
$mail_site,$mail_va,$language_id,$timezone,$jabber_address,$jabber_only,$theme_id,$unix_box,$address,$address2,$phone,$fax,$title,$ccode){
- $new_user = new GFUser();
+ $new_user = new FFUser();
$register =
$new_user->create($unix_name,$firstname,$lastname,$password1,$password2,$email,$mail_site,$mail_va,$language_id,$timezone,$jabber_address,$jabber_only,$theme_id,$unix_box,$address,$address2,$phone,$fax,$title,$ccode);
-----------------------------------------------------------------------
Summary of changes:
src/bin/inject-users.php | 2 +-
src/common/forum/ForumMessage.class.php | 2 +-
src/common/include/AuthPlugin.class.php | 6 +--
src/common/include/User.class.php | 24 +++++------
src/common/include/UserManager.class.php | 2 +-
src/common/pm/ProjectTasksForUser.class.php | 2 +-
src/docs/README.Plugins | 46 +++++++++++-----------
src/plugins/authcas/common/AuthCASPlugin.class.php | 2 +-
.../authhttpd/common/AuthHTTPDPlugin.class.php | 2 +-
.../authldap/common/AuthLDAPPlugin.class.php | 4 +-
src/plugins/projectimport/www/usersimport.php | 2 +-
src/plugins/scmgit/common/GitPlugin.class.php | 2 +-
src/plugins/scmhg/common/HgPlugin.class.php | 2 +-
src/plugins/scmsvn/common/SVNPlugin.class.php | 2 +-
src/www/account/register.php | 2 +-
src/www/admin/globalroleedit.php | 4 +-
src/www/export/rssAboTask.php | 6 +--
src/www/soap/common/user.php | 2 +-
18 files changed, 57 insertions(+), 57 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
