Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[10307] XoopsCore/branches/2.6.x/2.6.0/htdocs
|
From: <tr...@us...> - 2012-12-02 20:40:27
|
Revision: 10307
http://sourceforge.net/p/xoops/svn/10307
Author: trabis
Date: 2012-12-02 20:40:24 +0000 (Sun, 02 Dec 2012)
Log Message:
-----------
Updating profile module
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/member.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/activate.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/category.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/deactivate.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/field.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/header.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/permissions.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/step.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/visibility.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changemail.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/field.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/profile.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/edituser.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/register.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/userinfo.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/member.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/member.php 2012-12-02 19:22:48 UTC (rev 10306)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/member.php 2012-12-02 20:40:24 UTC (rev 10307)
@@ -87,7 +87,7 @@
/**
* create a new user
*
- * @return object XoopsUser reference to the new user
+ * @return XoopsUser reference to the new user
*/
public function createUser()
{
@@ -99,7 +99,7 @@
* retrieve a group
*
* @param int $id ID for the group
- * @return object XoopsGroup reference to the group
+ * @return XoopsGroup reference to the group
*/
public function getGroup($id)
{
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php 2012-12-02 19:22:48 UTC (rev 10306)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php 2012-12-02 20:40:24 UTC (rev 10307)
@@ -1032,7 +1032,7 @@
* @param bool $force flag to force the query execution despite security settings
* @return mixed
*/
- public function insert($object, $force = true)
+ public function insert(XoopsObject $object, $force = true)
{
/* @var $handler XoopsModelWrite */
$handler = $this->loadHandler('write');
@@ -1046,7 +1046,7 @@
* @param bool $force
* @return bool FALSE if failed.
*/
- public function delete($object, $force = false)
+ public function delete(XoopsObject $object, $force = false)
{
/* @var $handler XoopsModelWrite */
$handler = $this->loadHandler('write');
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/activate.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/activate.php 2012-12-02 19:22:48 UTC (rev 10306)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/activate.php 2012-12-02 20:40:24 UTC (rev 10307)
@@ -81,8 +81,10 @@
if (count($getuser) == 0) {
$xoops->redirect(XOOPS_URL, 2, _US_SORRYNOTFOUND);
}
- if ($getuser[0]->isActive()) {
- $xoops->redirect(XOOPS_URL, 2, sprintf(_US_ACONTACT, $getuser[0]->getVar('email')));
+ /* @var XoopsUser $getuser */
+ $getuser = $getuser[0];
+ if ($getuser->isActive()) {
+ $xoops->redirect(XOOPS_URL, 2, sprintf(_US_ACONTACT, $getuser->getVar('email')));
}
$xoopsMailer = $xoops->getMailer();
$xoopsMailer->useMail();
@@ -93,7 +95,7 @@
$xoopsMailer->setToUsers($getuser[0]);
$xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
$xoopsMailer->setFromName($xoops->getConfig('sitename'));
- $xoopsMailer->setSubject(sprintf(_US_USERKEYFOR, $getuser[0]->getVar('uname') ));
+ $xoopsMailer->setSubject(sprintf(_US_USERKEYFOR, $getuser->getVar('uname') ));
if (!$xoopsMailer->send()) {
echo _US_YOURREGMAILNG;
} else {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/category.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/category.php 2012-12-02 19:22:48 UTC (rev 10306)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/category.php 2012-12-02 20:40:24 UTC (rev 10307)
@@ -23,10 +23,8 @@
include dirname(__FILE__) . '/header.php';
// Get main instance
$system = System::getInstance();
-// Check users rights
-if (!$xoops->isUser() || !$xoops->isModule() || !$xoops->user->isAdmin($xoops->module->mid())) {
- exit(_NOPERM);
-}
+$xoops = Xoops::getInstance();
+
// Get Action type
$op = $system->cleanVars($_REQUEST, 'op', 'list', 'string');
// Call header
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/deactivate.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/deactivate.php 2012-12-02 19:22:48 UTC (rev 10306)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/deactivate.php 2012-12-02 20:40:24 UTC (rev 10307)
@@ -21,6 +21,7 @@
*/
include dirname(__FILE__) . '/header.php';
+$xoops = Xoops::getInstance();
$xoops->header();
if (!isset($_REQUEST['uid'])) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/field.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/field.php 2012-12-02 19:22:48 UTC (rev 10306)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/field.php 2012-12-02 20:40:24 UTC (rev 10307)
@@ -23,10 +23,8 @@
include dirname(__FILE__) . '/header.php';
// Get main instance
$system = System::getInstance();
-// Check users rights
-if (!$xoops->isUser() || !$xoops->isModule() || !$xoops->user->isAdmin($xoops->module->mid())) {
- exit(_NOPERM);
-}
+$xoops = Xoops::getInstance();
+
// Get Action type
$op = $system->cleanVars($_REQUEST, 'op', 'list', 'string');
// Call header
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/header.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/header.php 2012-12-02 19:22:48 UTC (rev 10306)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/header.php 2012-12-02 20:40:24 UTC (rev 10307)
@@ -22,4 +22,5 @@
require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
XoopsLoad::load('system', 'system');
+$xoops = Xoops::getInstance();
$xoops->loadLanguage('user');
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/permissions.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/permissions.php 2012-12-02 19:22:48 UTC (rev 10306)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/permissions.php 2012-12-02 20:40:24 UTC (rev 10307)
@@ -23,10 +23,8 @@
include dirname(__FILE__) . '/header.php';
// Get main instance
$system = System::getInstance();
-// Check users rights
-if (!$xoops->isUser() || !$xoops->isModule() || !$xoops->user->isAdmin($xoops->module->mid())) {
- exit(_NOPERM);
-}
+$xoops = Xoops::getInstance();
+
// Get Action type
$op = $system->cleanVars($_REQUEST, 'op', 'edit', 'string');
// Call header
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/step.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/step.php 2012-12-02 19:22:48 UTC (rev 10306)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/step.php 2012-12-02 20:40:24 UTC (rev 10307)
@@ -23,10 +23,8 @@
include dirname(__FILE__) . '/header.php';
// Get main instance
$system = System::getInstance();
-// Check users rights
-if (!$xoops->isUser() || !$xoops->isModule() || !$xoops->user->isAdmin($xoops->module->mid())) {
- exit(_NOPERM);
-}
+$xoops = Xoops::getInstance();
+
// Get Action type
$op = $system->cleanVars($_REQUEST, 'op', 'list', 'string');
// Call header
@@ -47,7 +45,7 @@
$xoops->tpl->assign('steps', $regstep_Handler->getObjects(null, true, false));
$xoops->tpl->assign('step', true);
break;
-
+
case "new":
$admin_page->addItemButton(_PROFILE_AM_STEP_LIST, 'step.php', 'application-view-detail');
$admin_page->renderButton();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/visibility.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/visibility.php 2012-12-02 19:22:48 UTC (rev 10306)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/admin/visibility.php 2012-12-02 20:40:24 UTC (rev 10307)
@@ -23,10 +23,8 @@
include dirname(__FILE__) . '/header.php';
// Get main instance
$system = System::getInstance();
-// Check users rights
-if (!$xoops->isUser() || !$xoops->isModule() || !$xoops->user->isAdmin($xoops->module->mid())) {
- exit(_NOPERM);
-}
+$xoops = Xoops::getInstance();
+
//there is no way to override current tabs when using system menu
//this dirty hack will have to do it
$_SERVER['REQUEST_URI'] = "admin/permissions.php";
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changemail.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changemail.php 2012-12-02 19:22:48 UTC (rev 10306)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/changemail.php 2012-12-02 20:40:24 UTC (rev 10307)
@@ -52,7 +52,7 @@
}
if ($errors) {
- $msg = implode('<br />', $errros);
+ $msg = implode('<br />', $errors);
} else {
//update password
$xoops->user->setVar('email', trim($_POST['newmail']));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/field.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/field.php 2012-12-02 19:22:48 UTC (rev 10306)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/field.php 2012-12-02 20:40:24 UTC (rev 10307)
@@ -190,10 +190,6 @@
$element = new XoopsFormDatetime($caption, $name, 15, $value);
break;
- case "list":
- $element = new XoopsFormSelectList($caption, $name, $value, 1, $options[0]);
- break;
-
case "timezone":
$element = new XoopsFormSelectTimezone($caption, $name, $value);
$element->setExtra("style='width: 280px;'");
@@ -445,8 +441,9 @@
$criteria = new Criteria('o.field_id', 0, "!=");
$criteria->setSort('l.cat_weight ASC, o.field_weight');
$field_objs = $this->getByLink($criteria, array('o.*'), true, 'cat_id', 'cat_id');
- foreach (array_keys($field_objs) as $i) {
- $fields[$field_objs[$i]->getVar('field_name')] = $field_objs[$i];
+ /* @var ProfileField $field */
+ foreach ($field_objs as $field) {
+ $fields[$field->getVar('field_name')] = $field;
}
}
return $fields;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/profile.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/profile.php 2012-12-02 19:22:48 UTC (rev 10306)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/class/profile.php 2012-12-02 20:40:24 UTC (rev 10307)
@@ -41,13 +41,15 @@
/**
* Initiate variables
- * @param array $fields field information array of {@link XoopsProfileField} objects
+ *
+ * @param array $fields field information array of {@link ProfileField} objects
*/
public function init($fields)
{
if (is_array($fields) && count($fields) > 0) {
- foreach (array_keys($fields) as $key) {
- $this->initVar($key, $fields[$key]->getVar('field_valuetype'), $fields[$key]->getVar('field_default', 'n'), $fields[$key]->getVar('field_required'), $fields[$key]->getVar('field_maxlength'));
+ /* @var ProfileField $field */
+ foreach ($fields as $key => $field) {
+ $this->initVar($key, $field->getVar('field_valuetype'), $field->getVar('field_default', 'n'), $field->getVar('field_required'), $field->getVar('field_maxlength'));
}
}
}
@@ -59,8 +61,10 @@
* @var bool|ProfileFieldHandler
*/
private $_fHandler;
+
/**
- * Array of {@link XoopsProfileField} objects
+ * Array of {@link ProfileField} objects
+ *
* @var array
*/
private $_fields = array();
@@ -93,8 +97,9 @@
/**
* Get a {@link ProfileProfile}
*
- * @param $uid
+ * @param $uid
* @param bool $createOnFailure create a new {@link ProfileProfile} if none is fetched
+ *
* @return null|ProfileProfile|XoopsObject
*/
public function getProfile($uid, $createOnFailure = true)
@@ -135,9 +140,9 @@
/**
* Fetch fields
*
- * @param CriteriaElement $criteria {@link CriteriaElement} object
- * @param bool $id_as_key return array with field IDs as key?
- * @param bool $as_object return array of objects?
+ * @param CriteriaElement $criteria {@link CriteriaElement} object
+ * @param bool $id_as_key return array with field IDs as key?
+ * @param bool $as_object return array of objects?
*
* @return array
**/
@@ -150,7 +155,7 @@
* Insert a field in the database
*
* @param ProfileField $field
- * @param bool $force
+ * @param bool $force
*
* @return bool
*/
@@ -163,7 +168,7 @@
* Delete a field from the database
*
* @param ProfileField $field
- * @param bool $force
+ * @param bool $force
*
* @return bool
*/
@@ -176,7 +181,8 @@
* Save a new field in the database
*
* @param array $vars array of variables, taken from $module->loadInfo('profile')['field']
- * @param int $weight
+ * @param int $weight
+ *
* @return string
*/
public function saveField($vars, $weight = 0)
@@ -230,8 +236,8 @@
/**
* insert a new object in the database
*
- * @param XoopsObject|ProfileProfile $obj reference to the object
- * @param bool $force whether to force the query execution despite security settings
+ * @param XoopsObject|ProfileProfile $obj reference to the object
+ * @param bool $force whether to force the query execution despite security settings
*
* @return bool FALSE if failed, TRUE if already present and unchanged or successful
*/
@@ -261,8 +267,8 @@
* Search profiles and users
*
* @param CriteriaElement $criteria CriteriaElement
- * @param array $searchvars Fields to be fetched
- * @param array $groups for Usergroups is selected (only admin!)
+ * @param array $searchvars Fields to be fetched
+ * @param array $groups for Usergroups is selected (only admin!)
*
* @return array
*/
@@ -282,8 +288,7 @@
}
$sql_select = "SELECT " . (empty($searchvars) ? "u.*, p.*" : implode(", ", $sv));
- $sql_from = " FROM " . $this->db->prefix("users") . " AS u LEFT JOIN " . $this->table . " AS p ON u.uid=p.profile_id" . (empty($groups)
- ? "" : " LEFT JOIN " . $this->db->prefix("groups_users_link") . " AS g ON u.uid=g.uid");
+ $sql_from = " FROM " . $this->db->prefix("users") . " AS u LEFT JOIN " . $this->table . " AS p ON u.uid=p.profile_id" . (empty($groups) ? "" : " LEFT JOIN " . $this->db->prefix("groups_users_link") . " AS g ON u.uid=g.uid");
$sql_clause = " WHERE 1=1";
$sql_order = "";
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/edituser.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/edituser.php 2012-12-02 19:22:48 UTC (rev 10306)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/edituser.php 2012-12-02 20:40:24 UTC (rev 10307)
@@ -66,10 +66,11 @@
$profile->setVar('profile_id', $edituser->getVar('uid'));
}
- foreach (array_keys($fields) as $i) {
- $fieldname = $fields[$i]->getVar('field_name');
- if (in_array($fields[$i]->getVar('field_id'), $editable_fields) && isset($_REQUEST[$fieldname])) {
- $value = $fields[$i]->getValueForSave($_REQUEST[$fieldname]);
+ /* @var ProfileField $field */
+ foreach ($fields as $field) {
+ $fieldname = $field->getVar('field_name');
+ if (in_array($field->getVar('field_id'), $editable_fields) && isset($_REQUEST[$fieldname])) {
+ $value = $field->getValueForSave($_REQUEST[$fieldname]);
if (in_array($fieldname, $profile_handler->getUserVars())) {
$edituser->setVar($fieldname, $value);
} else {
@@ -253,7 +254,9 @@
if ($user_avatar != 'avatars/blank.gif') {
$avatars = $avatar_handler->getObjects(new Criteria('avatar_file', $user_avatar));
if (is_object($avatars[0])) {
- $avatar_handler->addUser($avatars[0]->getVar('avatar_id'), $xoops->user->getVar('uid'));
+ /* @var XoopsAvatar $avatar */
+ $avatar = $avatars[0];
+ $avatar_handler->addUser($avatar->getVar('avatar_id'), $xoops->user->getVar('uid'));
}
}
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php 2012-12-02 19:22:48 UTC (rev 10306)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/include/forms.php 2012-12-02 20:40:24 UTC (rev 10307)
@@ -73,17 +73,18 @@
$fields = $profile_handler->loadFields();
$_SESSION['profile_required'] = array();
$weights = array();
- foreach (array_keys($fields) as $i) {
- if ($fields[$i]->getVar('step_id') == $step['step_id']) {
- $fieldinfo['element'] = $fields[$i]->getEditElement($user, $profile);
+ /* @var ProfileField $field */
+ foreach ($fields as $field) {
+ if ($field->getVar('step_id') == $step['step_id']) {
+ $fieldinfo['element'] = $field->getEditElement($user, $profile);
//assign and check (=)
- if ($fieldinfo['required'] = $fields[$i]->getVar('field_required')) {
- $_SESSION['profile_required'][$fields[$i]->getVar('field_name')] = $fields[$i]->getVar('field_title');
+ if ($fieldinfo['required'] = $field->getVar('field_required')) {
+ $_SESSION['profile_required'][$field->getVar('field_name')] = $field->getVar('field_title');
}
- $key = $fields[$i]->getVar('cat_id');
+ $key = $field->getVar('cat_id');
$elements[$key][] = $fieldinfo;
- $weights[$key][] = $fields[$i]->getVar('field_weight');
+ $weights[$key][] = $field->getVar('field_weight');
}
}
ksort($elements);
@@ -194,28 +195,29 @@
$categories = array();
$all_categories = $cat_handler->getObjects(null, true, false);
$count_fields = count($fields);
- foreach (array_keys($fields) as $i) {
- if (in_array($fields[$i]->getVar('field_id'), $editable_fields)) {
+ /* @var ProfileField $field */
+ foreach ($fields as $field) {
+ if (in_array($field->getVar('field_id'), $editable_fields)) {
// Set default value for user fields if available
if ($user->isNew()) {
- $default = $fields[$i]->getVar('field_default');
+ $default = $field->getVar('field_default');
if ($default !== '' && $default !== null) {
- $user->setVar($fields[$i]->getVar('field_name'), $default);
+ $user->setVar($field->getVar('field_name'), $default);
}
}
- if ($profile->getVar($fields[$i]->getVar('field_name'), 'n') === null) {
- $default = $fields[$i]->getVar('field_default', 'n');
- $profile->setVar($fields[$i]->getVar('field_name'), $default);
+ if ($profile->getVar($field->getVar('field_name'), 'n') === null) {
+ $default = $field->getVar('field_default', 'n');
+ $profile->setVar($field->getVar('field_name'), $default);
}
- $fieldinfo['element'] = $fields[$i]->getEditElement($user, $profile);
- $fieldinfo['required'] = $fields[$i]->getVar('field_required');
+ $fieldinfo['element'] = $field->getEditElement($user, $profile);
+ $fieldinfo['required'] = $field->getVar('field_required');
- $key = @$all_categories[$fields[$i]->getVar('cat_id')]['cat_weight'] * $count_fields + $fields[$i]->getVar('cat_id');
+ $key = @$all_categories[$field->getVar('cat_id')]['cat_weight'] * $count_fields + $field->getVar('cat_id');
$elements[$key][] = $fieldinfo;
- $weights[$key][] = $fields[$i]->getVar('field_weight');
- $categories[$key] = @$all_categories[$fields[$i]->getVar('cat_id')];
+ $weights[$key][] = $field->getVar('field_weight');
+ $categories[$key] = @$all_categories[$field->getVar('cat_id')];
}
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/register.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/register.php 2012-12-02 19:22:48 UTC (rev 10306)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/register.php 2012-12-02 20:40:24 UTC (rev 10307)
@@ -91,10 +91,11 @@
$newuser = $member_handler->createUser();
$profile = $profile_handler->create();
if (count($fields) > 0) {
- foreach (array_keys($fields) as $i) {
- $fieldname = $fields[$i]->getVar('field_name');
+ /* @var ProfileField $field */
+ foreach ($fields as $field) {
+ $fieldname = $field->getVar('field_name');
if (in_array($fieldname, $userfields)) {
- $default = $fields[$i]->getVar('field_default');
+ $default = $field->getVar('field_default');
if ($default === '' || $default === null) {
continue;
}
@@ -109,10 +110,11 @@
}
// Lets merge current $_POST with $_SESSION['profile_post'] so we can have access to info submited in previous steps
-// Get all fields that we can expect from a $_POST inlcuding our private '_message_'
+// Get all fields that we can expect from a $_POST including our private '_message_'
$fieldnames = array();
-foreach (array_keys($fields) as $i) {
- $fieldnames[] = $fields[$i]->getVar('field_name');
+/* @var ProfileField $field */
+foreach ($fields as $field) {
+ $fieldnames[] = $field->getVar('field_name');
}
$fieldnames = array_merge($fieldnames, $userfields);
$fieldnames[] = '_message_';
@@ -136,16 +138,16 @@
}
// Set vars from $_POST/$_SESSION['profile_post']
-foreach (array_keys($fields) as $field) {
- if (!isset($_POST[$field])) {
+foreach ($fields as $fieldname => $field) {
+ if (!isset($_POST[$fieldname])) {
continue;
}
- $value = $fields[$field]->getValueForSave($_POST[$field]);
+ $value = $field->getValueForSave($_POST[$fieldname]);
if (in_array($field, $userfields)) {
- $newuser->setVar($field, $value);
+ $newuser->setVar($fieldname, $value);
} else {
- $profile->setVar($field, $value);
+ $profile->setVar($fieldname, $value);
}
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/userinfo.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/userinfo.php 2012-12-02 19:22:48 UTC (rev 10306)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/profile/userinfo.php 2012-12-02 20:40:24 UTC (rev 10307)
@@ -160,26 +160,28 @@
}
}
}
+$categories = array();
foreach (array_keys($cats) as $i) {
$categories[$i] = $cats[$i];
}
$profile = $profile_handler->getProfile($thisUser->getVar('uid'));
// Add dynamic fields
-foreach (array_keys($fields) as $i) {
+/* @var ProfileField $field */
+foreach ($fields as $field) {
//If field is not visible, skip
- //if ( $field_ids_visible && !in_array($fields[$i]->getVar('field_id'), $field_ids_visible) ) continue;
- if (!in_array($fields[$i]->getVar('field_id'), $field_ids_visible)) {
+ //if ( $field_ids_visible && !in_array($field->getVar('field_id'), $field_ids_visible) ) continue;
+ if (!in_array($field->getVar('field_id'), $field_ids_visible)) {
continue;
}
- $cat_id = $fields[$i]->getVar('cat_id');
- $value = $fields[$i]->getOutputValue($thisUser, $profile);
+ $cat_id = $field->getVar('cat_id');
+ $value = $field->getOutputValue($thisUser, $profile);
if (is_array($value)) {
$value = implode('<br />', array_values($value));
}
if ($value) {
- $categories[$cat_id]['fields'][] = array('title' => $fields[$i]->getVar('field_title'), 'value' => $value);
- $weights[$cat_id][] = $fields[$i]->getVar('cat_id');
+ $categories[$cat_id]['fields'][] = array('title' => $field->getVar('field_title'), 'value' => $value);
+ $weights[$cat_id][] = $field->getVar('cat_id');
}
}
@@ -197,17 +199,19 @@
if (count($mids) > 0 && count($allowed_mids) > 0) {
foreach ($mids as $mid) {
if (in_array($mid, $allowed_mids)) {
- $results = $modules[$mid]->search('', '', 5, 0, $thisUser->getVar('uid'));
+ /* @var XoopsModule $module */
+ $module = $modules[$mid];
+ $results = $module->search('', '', 5, 0, $thisUser->getVar('uid'));
$count = count($results);
if (is_array($results) && $count > 0) {
for ($i = 0; $i < $count; $i++) {
if (isset($results[$i]['image']) && $results[$i]['image'] != '') {
- $results[$i]['image'] = XOOPS_URL . '/modules/' . $modules[$mid]->getVar('dirname', 'n') . '/' . $results[$i]['image'];
+ $results[$i]['image'] = XOOPS_URL . '/modules/' . $module->getVar('dirname', 'n') . '/' . $results[$i]['image'];
} else {
$results[$i]['image'] = XOOPS_URL . '/images/icons/posticon2.gif';
}
if (!preg_match("/^http[s]*:\/\//i", $results[$i]['link'])) {
- $results[$i]['link'] = XOOPS_URL . "/modules/" . $modules[$mid]->getVar('dirname', 'n') . "/" . $results[$i]['link'];
+ $results[$i]['link'] = XOOPS_URL . "/modules/" . $module->getVar('dirname', 'n') . "/" . $results[$i]['link'];
}
$results[$i]['title'] = $myts->htmlspecialchars($results[$i]['title']);
$results[$i]['time'] = $results[$i]['time'] ? XoopsLocal::formatTimestamp($results[$i]['time']) : '';
@@ -218,11 +222,11 @@
$showall_link = '';
}
$xoops->tpl->append('modules', array(
- 'name' => $modules[$mid]->getVar('name'), 'results' => $results,
+ 'name' => $module->getVar('name'), 'results' => $results,
'showall_link' => $showall_link
));
}
- unset($modules[$mid]);
+ unset($modules[$mid], $module);
}
}
}
|
