Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

More fixes for userimages.

  • Loading branch information...
commit becfbdd94186f204ee57e54ddeda729a1a892e70 1 parent 12313dc
@ghengeveld ghengeveld authored
View
9 lang/en/admin.en.lang.php
@@ -241,21 +241,12 @@
* Users Subsection
*/
-$L['cfg_av_maxsize'] = array('Avatar, maximum file size', 'Default: 8000 bytes');
-$L['cfg_av_maxx'] = array('Avatar, maximum width', 'Default: 64 pixels');
-$L['cfg_av_maxy'] = array('Avatar, maximum height', 'Default: 64 pixels');
$L['cfg_disablereg'] = array('Disable registration process', 'Prevent users from registering new accounts');
$L['cfg_disablewhosonline'] = array('Disable who\'s online', 'Automatically enabled if you turn on the Shield');
$L['cfg_forcerememberme'] = array('Force "remember me"', 'Use it on multi-domain sites or if there are sudden logouts');
$L['cfg_maxusersperpage'] = array('Maximum lines in userlist', '');
-$L['cfg_ph_maxsize'] = array('Photo, maximum file size', 'Default: 8000 bytes');
-$L['cfg_ph_maxx'] = array('Photo, maximum width', 'Default: 96 pixels');
-$L['cfg_ph_maxy'] = array('Photo, maximum height', 'Default: 96 pixels');
$L['cfg_regnoactivation'] = array('Skip e-mail check for new users', '\'No\'recommended, for security reasons');
$L['cfg_regrequireadmin'] = array('Administrators must validate new accounts', '');
-$L['cfg_sig_maxsize'] = array('Signature, maximum file size', 'Default: 50000 bytes');
-$L['cfg_sig_maxx'] = array('Signature, maximum width', 'Default: 468 pixels');
-$L['cfg_sig_maxy'] = array('Signature, maximum height', 'Default: 60 pixels');
$L['cfg_user_email_noprotection'] = array('Disable password protection of e-mail change', '\'No\' recommended, for security reasons');
$L['cfg_useremailchange'] = array('Allow users to change their e-mail address', '\'No\' recommended, for security reasons');
$L['cfg_usertextimg'] = array('Allow images and HTML in user signature', '\'No\' recommended, for security reasons');
View
9 lang/en/users.en.lang.php
@@ -68,18 +68,9 @@
* Users
*/
-$L['pro_avatarnotvalid'] = 'This avatar is not a valid %1$s image.'; // New in 0.0.2
-$L['pro_avatarschoose'] = 'Click an image below to set it as your own avatar';
-$L['pro_avatarspreset'] = '...or click here to display a gallery of pre-loaded avatars';
-$L['pro_avatarsupload'] = 'Upload an avatar';
-$L['pro_avataruploadfailed'] = 'The upload failed, delete the old avatar before to free the slot!';
$L['pro_emailandpass'] = 'You can not change both e-mail and password at a time'; // New in 0.0.5
$L['pro_passdiffer'] = 'The 2 password fields do not match';
$L['pro_passtoshort'] = 'The password must be at least 4 chars long and must consist of alphanumerical characters and underscore only.';
-$L['pro_photonotvalid'] = 'This photo is not a valid %1$s image.'; // New in 0.0.2
-$L['pro_photoupload'] = 'Upload a photography';
-$L['pro_sigotvalid'] = 'This signature is not a valid %1$s image.'; // New in 0.0.2
-$L['pro_sigupload'] = 'Upload a signature';
$L['pro_subtitle'] = 'Your personal account';
$L['pro_title'] = 'Profile';
$L['pro_wrongpass'] = 'You didn\'t enter your present password, or it\'s wrong';
View
9 lang/ru/users.ru.lang.php
@@ -68,18 +68,9 @@
* Users
*/
-$L['pro_avatarnotvalid'] = 'Этот аватар не является %1$s-файлом.'; // New in 0.0.2
-$L['pro_avatarschoose'] = 'В качестве своего аватара выберите следующие изображения';
-$L['pro_avatarspreset'] = '...или выбрать аватар из списка доступных';
-$L['pro_avatarsupload'] = 'Загрузить аватар';
-$L['pro_avataruploadfailed'] = 'Ошибка загрузки: удалите старый аватар!';
$L['pro_emailandpass'] = 'Вы не можете изменить и e-mail и пароль одновременно'; // New in 0.0.5
$L['pro_passdiffer'] = 'Введенные пароли не совпадают';
$L['pro_passtoshort'] = 'Пароль должен состоять из 4 или более символов: букв, цифр и символа подчеркивания';
-$L['pro_photonotvalid'] = 'Это фото не является %1$s-файлом.'; // New in 0.0.2
-$L['pro_photoupload'] = 'Загрузить фото';
-$L['pro_sigotvalid'] = 'Эта подпись не является %1$s-файлом.'; // New in 0.0.2
-$L['pro_sigupload'] = 'Загрузить подпись';
$L['pro_subtitle'] = 'Настройки ваших личных данных';
$L['pro_title'] = 'Ваша учетная запись';
$L['pro_wrongpass'] = 'Вы не ввели текущий пароль либо он неверен';
View
4 modules/page/page.admin.php
@@ -354,7 +354,7 @@
$totalitems = $db->query("SELECT COUNT(*) FROM $db_pages WHERE ".$sqlwhere)->fetchColumn();
$pagenav = cot_pagenav('admin', 'm=page&sorttype='.$sorttype.'&sortway='.$sortway.'&filter='.$filter, $d, $totalitems, $cfg['maxrowsperpage'], 'd', '', $cfg['jquery'] && $cfg['turnajax']);
-$sql = $db->query("SELECT p.*, u.user_name, u.user_avatar
+$sql = $db->query("SELECT p.*, u.user_name
FROM $db_pages as p
LEFT JOIN $db_users AS u ON u.user_id=p.page_ownerid
WHERE $sqlwhere
@@ -392,7 +392,6 @@
'ADMIN_PAGE_ID_URL' => cot_url('page', 'id='.$row['page_id']),
'ADMIN_PAGE_TYPE' => $page_type,
'ADMIN_PAGE_OWNER' => cot_build_user($row['page_ownerid'], htmlspecialchars($row['user_name'])),
- 'ADMIN_PAGE_OWNER_AVATAR' => cot_build_userimage($row['user_avatar'], 'avatar'),
'ADMIN_PAGE_FILE_BOOL' => $row['page_file'],
'ADMIN_PAGE_URL_FOR_VALIDATED' => cot_url('admin', 'm=page&a=validate&id='.$row['page_id'].'&d='.$d.'&'.cot_xg()),
'ADMIN_PAGE_URL_FOR_DELETED' => cot_url('admin', 'm=page&a=delete&id='.$row['page_id'].'&d='.$d.'&'.cot_xg()),
@@ -400,6 +399,7 @@
'ADMIN_PAGE_ODDEVEN' => cot_build_oddeven($ii),
'ADMIN_PAGE_CAT_COUNT' => $sub_count
));
+ $t->assign(cot_generate_usertags($row['page_ownerid'], 'ADMIN_PAGE_OWNER_'), htmlspecialchars($row['user_name']));
/* === Hook - Part2 : Include === */
foreach ($extp as $pl)
View
7 plugins/comments/inc/comments.functions.php
@@ -142,13 +142,11 @@ function cot_comments_display($ext_name, $code, $cat = '')
while ($row = $sql->fetch())
{
$i++;
- $com_author = htmlspecialchars($row['com_author']);
$com_admin = ($auth_admin) ? cot_rc('comments_code_admin', array(
'ipsearch' => cot_build_ipsearch($row['com_authorip']),
'delete_url' => cot_url('plug', 'e=comments&a=delete&cat='.$cat.'&id='.$row['com_id'].'&'.cot_xg())
)) : '';
- $com_authorlink = cot_build_user($row['com_authorid'], $com_author);
$com_text = cot_parse($row['com_text'], $cfg['plugin']['comments']['markup']);
@@ -168,15 +166,14 @@ function cot_comments_display($ext_name, $code, $cat = '')
'COMMENTS_ROW_ID' => $row['com_id'],
'COMMENTS_ROW_ORDER' => $i,
'COMMENTS_ROW_URL' => cot_url($link_area, $link_params, '#c'.$row['com_id']),
- 'COMMENTS_ROW_AUTHOR' => $com_authorlink,
+ 'COMMENTS_ROW_AUTHOR' => cot_build_user($row['com_authorid'], htmlspecialchars($row['com_author'])),
'COMMENTS_ROW_AUTHORID' => $row['com_authorid'],
- 'COMMENTS_ROW_AVATAR' => cot_build_userimage($row['user_avatar'], 'avatar'),
'COMMENTS_ROW_TEXT' => $com_text,
'COMMENTS_ROW_DATE' => @date($cfg['dateformat'], $row['com_date'] + $usr['timezone'] * 3600),
'COMMENTS_ROW_ADMIN' => $com_admin,
'COMMENTS_ROW_EDIT' => $com_edit
));
- $t->assign(cot_generate_usertags($pag, 'COMMENTS_ROW_AUTHOR'), $com_author);
+ $t->assign(cot_generate_usertags($row['com_authorid'], 'COMMENTS_ROW_AUTHOR_'), htmlspecialchars($row['com_author']));
/* === Hook - Part2 : Include === */
foreach ($extp as $pl)
View
2  plugins/comments/tpl/comments.tpl
@@ -47,7 +47,7 @@
<!-- BEGIN: COMMENTS_ROW -->
<div class="comments1">
- <p>{COMMENTS_ROW_AVATAR}</p>
+ <p>{COMMENTS_ROW_AUTHOR_AVATAR}</p>
<p><a href="{COMMENTS_ROW_URL}" id="c{COMMENTS_ROW_ID}">{COMMENTS_ROW_ORDER}.</a> {COMMENTS_ROW_AUTHOR}</p>
<p>{COMMENTS_ROW_DATE}</p>
</div>
View
29 plugins/userimages/inc/userimages.functions.php
@@ -71,4 +71,33 @@ function cot_userimages_config_remove($code)
return $result;
}
+/**
+ * Returns user image html code
+ *
+ * @param string $src File path
+ * @param string $code Userimage code
+ * @return string
+ */
+function cot_userimages_build($src, $code='')
+{
+ global $R;
+ if($src && $code && $R["userimg_$code"])
+ {
+ return cot_rc("userimg_img_$code", array('src' => $src, 'alt' => $L[$code], 'class' => $code));
+ }
+ if($src && $code)
+ {
+ return cot_rc('userimg_img', array('src' => $src, 'alt' => $L[$code], 'class' => $code));
+ }
+ if($src)
+ {
+ return cot_rc('userimg_img', array('src' => $src, 'alt' => '', 'class' => ''));
+ }
+ if($R["userimg_default_$code"])
+ {
+ return cot_rc("userimg_default_$code");
+ }
+ return '';
+}
+
?>
View
3  plugins/userimages/inc/userimages.resources.php
@@ -6,5 +6,8 @@
$R['userimg_selectfile'] = '{$form_input}';
$R['userimg_html'] = '<div class="userimg_{$code}">{$existing}{$selectfile}</div>';
$R['userimg_remove'] = '<a href="{$url}">'.$L['Delete'].'</a>';
+$R['userimg_img'] = '<img src="{$src}" alt="{$alt}" class="userimg {$class}" />';
+
+$R['userimg_default_avatar'] = '<img src="datas/defaultav/blank.png" alt="'.$L['Avatar'].'" class="avatar" />';
?>
View
10 plugins/userimages/lang/userimages.en.lang.php
@@ -13,4 +13,14 @@
$L['userimages_help'] = '';
+$L['pro_avatarnotvalid'] = 'This avatar is not a valid %1$s image.'; // New in 0.0.2
+$L['pro_avatarschoose'] = 'Click an image below to set it as your own avatar';
+$L['pro_avatarspreset'] = '...or click here to display a gallery of pre-loaded avatars';
+$L['pro_avatarsupload'] = 'Upload an avatar';
+$L['pro_avataruploadfailed'] = 'The upload failed, delete the old avatar before to free the slot!';
+$L['pro_photonotvalid'] = 'This photo is not a valid %1$s image.'; // New in 0.0.2
+$L['pro_photoupload'] = 'Upload a photography';
+$L['pro_sigotvalid'] = 'This signature is not a valid %1$s image.'; // New in 0.0.2
+$L['pro_sigupload'] = 'Upload a signature';
+
?>
View
26 plugins/userimages/lang/userimages.ru.lang.php
@@ -0,0 +1,26 @@
+<?php
+
+defined('COT_CODE') or die('Wrong URL.');
+
+$L['Code'] = 'Code';
+$L['Width'] = 'Width';
+$L['Height'] = 'Height';
+$L['CropRatio'] = 'Crop ratio';
+
+$L['AddNew'] = 'Add new';
+$L['CropNone'] = 'None (original width:height)';
+$L['CropFit'] = 'Fit (target width:height)';
+
+$L['userimages_help'] = '';
+
+$L['pro_avatarnotvalid'] = 'Этот аватар не является %1$s-файлом.'; // New in 0.0.2
+$L['pro_avatarschoose'] = 'В качестве своего аватара выберите следующие изображения';
+$L['pro_avatarspreset'] = '...или выбрать аватар из списка доступных';
+$L['pro_avatarsupload'] = 'Загрузить аватар';
+$L['pro_avataruploadfailed'] = 'Ошибка загрузки: удалите старый аватар!';
+$L['pro_photonotvalid'] = 'Это фото не является %1$s-файлом.'; // New in 0.0.2
+$L['pro_photoupload'] = 'Загрузить фото';
+$L['pro_sigotvalid'] = 'Эта подпись не является %1$s-файлом.'; // New in 0.0.2
+$L['pro_sigupload'] = 'Загрузить подпись';
+
+?>
View
4 plugins/userimages/userimages.profile.tags.php
@@ -18,11 +18,9 @@
defined('COT_CODE') or die('Wrong URL');
cot_require('userimages', true);
+cot_require_rc('userimages', true);
$userimages = cot_userimages_config_get();
-// cot_require('userimages', true, 'resources'); whats wrong with this ???
-require_once cot_incfile('userimages', 'resources', $is_plugin = true);
-
foreach($userimages as $code => $settings)
{
$userimg_existing = !empty($urr['user_'.$code]) ? cot_rc('userimg_existing', array(
View
28 plugins/userimages/userimages.users.edit.tags.php
@@ -0,0 +1,28 @@
+<?php
+/* ====================
+[BEGIN_COT_EXT]
+Hooks=users.edit.update.first
+[END_COT_EXT]
+==================== */
+
+/**
+ * Avatar and photo for users
+ *
+ * @package userimages
+ * @version 0.9.0
+ * @author Koradhil, Cotonti Team
+ * @copyright Copyright (c) Cotonti Team 2008-2010
+ * @license BSD
+ */
+
+defined('COT_CODE') or die('Wrong URL');
+
+cot_require('userimages', true);
+$userimages = cot_userimages_config_get();
+
+foreach($userimages as $code => $settings)
+{
+ $t->assign("USERS_EDIT_".strtoupper($code), cot_inputbox('text', "ruser$code", $urr["user_$code"], array('size' => 32, 'maxlength' => 255)));
+}
+
+?>
View
28 plugins/userimages/userimages.users.edit.update.php
@@ -0,0 +1,28 @@
+<?php
+/* ====================
+[BEGIN_COT_EXT]
+Hooks=users.edit.update.first
+[END_COT_EXT]
+==================== */
+
+/**
+ * Avatar and photo for users
+ *
+ * @package userimages
+ * @version 0.9.0
+ * @author Koradhil, Cotonti Team
+ * @copyright Copyright (c) Cotonti Team 2008-2010
+ * @license BSD
+ */
+
+defined('COT_CODE') or die('Wrong URL');
+
+cot_require('userimages', true);
+$userimages = cot_userimages_config_get();
+
+foreach($userimages as $code => $settings)
+{
+ $ruser["user_$code"] = cot_import("ruser$code",'P','TXT');
+}
+
+?>
View
29 plugins/userimages/userimages.usertags.main.php
@@ -0,0 +1,29 @@
+<?php
+/* ====================
+[BEGIN_COT_EXT]
+Hooks=usertags.main
+[END_COT_EXT]
+==================== */
+
+/**
+ * Avatar and photo for users
+ *
+ * @package userimages
+ * @version 0.9.0
+ * @author Koradhil, Cotonti Team
+ * @copyright Copyright (c) Cotonti Team 2008-2010
+ * @license BSD
+ */
+
+defined('COT_CODE') or die('Wrong URL');
+
+cot_require('userimages', true);
+cot_require_rc('userimages', true);
+$userimages = cot_userimages_config_get();
+
+foreach($userimages as $code => $settings)
+{
+ $temp_array[strtoupper($code)] = cot_userimages_build($user_data['user_'.$code], $code);
+}
+
+?>
View
3  setup/install.sql
@@ -338,9 +338,6 @@ CREATE TABLE `cot_users` (
`user_maingrp` int NOT NULL default '4',
`user_country` char(2) collate utf8_unicode_ci NOT NULL default '',
`user_text` text collate utf8_unicode_ci NOT NULL,
- `user_avatar` varchar(255) collate utf8_unicode_ci NOT NULL default '',
- `user_photo` varchar(255) collate utf8_unicode_ci NOT NULL default '',
- `user_signature` varchar(255) collate utf8_unicode_ci NOT NULL default '',
`user_timezone` decimal(2,1) NOT NULL default '0',
`user_birthdate` DATE NOT NULL DEFAULT '0000-00-00',
`user_gender` char(1) collate utf8_unicode_ci NOT NULL default 'U',
View
21 system/functions.php
@@ -1565,27 +1565,14 @@ function cot_build_user($id, $user)
}
/**
- * Returns user avatar image
+ * Returns user group icon
*
- * @param string $image Image src
+ * @param string $src Image file path
* @return string
*/
-function cot_build_userimage($image, $type = 'none')
+function cot_build_groupicon($src)
{
- global $R;
- if (empty($image) && $type == 'avatar')
- {
- return $R['img_avatar_default'];
- }
- if (empty($type))
- {
- $type = 'none';
- }
- if (!empty($image))
- {
- return cot_rc("img_$type", array('src' => $image));
- }
- return '';
+ return ($src) ? cot_rc("icon_group", array('src' => $src)) : '';
}
/**
View
5 system/resources.php
@@ -98,12 +98,9 @@
*/
$R['icon_flag'] = '<img class="flag" src="images/flags/{$code}.png" alt="{$alt}" />';
-$R['img_avatar'] = '<img src="{$src}" alt="'.$L['Avatar'].'" class="avatar" />';
-$R['img_avatar_default'] = '<img src="datas/defaultav/blank.png" alt="'.$L['Avatar'].'" class="avatar" />';
+$R['icon_group'] = '<img src="{$src}" alt="'.$L['Group'].'" />';
$R['img_none'] = '<img src="{$src}" alt="'.$L['Image'].'" />';
$R['img_pixel'] = '<img src="images/pixel.gif" width="{$x}" height="{$y}" alt="" />';
-$R['img_photo'] = '<img src="{$src}" alt="'.$L['Photo'].'" class="photo" />';
-$R['img_sig'] = '<img src="{$src}" alt="'.$L['Signature'].'" class="signature" />';
$R['img_smilie'] = '<img src="{$src}" alt="{$name}" class="icon" />';
$R['link_catpath'] = '<a href="{$url}" title="{$title}">{$title}</a>';
View
4 system/users/tpl/users.details.tpl
@@ -43,14 +43,18 @@
<td>{PHP.L.Registered}:</td>
<td>{USERS_DETAILS_REGDATE}</td>
</tr>
+ <!-- IF {USERS_DETAILS_AVATAR} -->
<tr>
<td>{PHP.L.Avatar}:</td>
<td>{USERS_DETAILS_AVATAR}</td>
</tr>
+ <!-- ENDIF -->
+ <!-- IF {USERS_DETAILS_PHOTO} -->
<tr>
<td>{PHP.L.Photo}:</td>
<td>{USERS_DETAILS_PHOTO}</td>
</tr>
+ <!-- ENDIF -->
</table>
</div>
View
6 system/users/tpl/users.edit.tpl
@@ -35,18 +35,24 @@
<td>{PHP.L.Language}:</td>
<td>{USERS_EDIT_LANG}</td>
</tr>
+ <!-- IF {USERS_EDIT_AVATAR} -->
<tr>
<td>{PHP.L.Avatar}:</td>
<td>{USERS_EDIT_AVATAR}</td>
</tr>
+ <!-- ENDIF -->
+ <!-- IF {USERS_EDIT_SIGNATURE} -->
<tr>
<td>{PHP.L.Signature}:</td>
<td>{USERS_EDIT_SIGNATURE}</td>
</tr>
+ <!-- ENDIF -->
+ <!-- IF {USERS_EDIT_PHOTO} -->
<tr>
<td>{PHP.L.Photo}:</td>
<td>{USERS_EDIT_PHOTO}</td>
</tr>
+ <!-- ENDIF -->
<tr>
<td>{PHP.themelang.usersedit.Newpassword}:</td>
<td>{USERS_EDIT_NEWPASS}<br />{PHP.themelang.usersedit.Newpasswordhint}</td>
View
4 system/users/tpl/users.profile.tpl
@@ -76,14 +76,18 @@
<td>{PHP.L.Gender}:</td>
<td>{USERS_PROFILE_GENDER}</td>
</tr>
+ <!-- IF {USERS_PROFILE_AVATAR} -->
<tr>
<td>{PHP.L.Avatar}:</td>
<td>{USERS_PROFILE_AVATAR}</td>
</tr>
+ <!-- ENDIF -->
+ <!-- IF {USERS_PROFILE_PHOTO} -->
<tr>
<td>{PHP.L.Photo}:</td>
<td>{USERS_PROFILE_PHOTO}</td>
</tr>
+ <!-- ENDIF -->
<tr>
<td>{PHP.L.Signature}:</td>
<td>{USERS_PROFILE_TEXT}</td>
View
6 system/users/users.edit.php
@@ -89,9 +89,6 @@
$ruser['user_maingrp'] = cot_import('rusermaingrp','P','INT');
$ruser['user_banexpire'] = cot_import('ruserbanexpire','P','INT');
$ruser['user_country'] = cot_import('rusercountry','P','ALP');
- $ruser['user_avatar'] = cot_import('ruseravatar','P','TXT');
- $ruser['user_photo'] = cot_import('ruserphoto','P','TXT');
- $ruser['user_signature'] = cot_import('rusersignature','P','TXT');
$ruser['user_text'] = cot_import('rusertext','P','HTM');
$ruser['user_email'] = cot_import('ruseremail','P','TXT');
$ruser['user_hideemail'] = cot_import('ruserhideemail','P','INT');
@@ -277,9 +274,6 @@
"USERS_EDIT_PMNOTIFY" => cot_radiobox($urr['user_pmnotify'], 'ruserpmnotify', array(1, 0), array($L['Yes'], $L['No'])),
"USERS_EDIT_TEXT" => cot_textarea('rusertext', $urr['user_text'], 4, 56, '', 'input_textarea_editor'),
"USERS_EDIT_TEXTBOXER" => cot_textarea('rusertext', $urr['user_text'], 4, 56, '', 'input_textarea_editor'),
- "USERS_EDIT_AVATAR" => cot_inputbox('text', 'ruseravatar', $urr['user_avatar'], array('size' => 32, 'maxlength' => 255)),
- "USERS_EDIT_PHOTO" => cot_inputbox('text', 'ruserphoto', $urr['user_photo'], array('size' => 32, 'maxlength' => 255)),
- "USERS_EDIT_SIGNATURE" => cot_inputbox('text', 'rusersignature', $urr['user_signature'], array('size' => 32, 'maxlength' => 255)),
"USERS_EDIT_GENDER" => cot_selectbox_gender($urr['user_gender'], 'rusergender'),
"USERS_EDIT_BIRTHDATE" => cot_selectbox_date(cot_date2stamp($urr['user_birthdate']), 'short', 'ruserbirthdate', date('Y', $sys['now_offset']), date('Y', $sys['now_offset']) - 100, false),
"USERS_EDIT_TIMEZONE" => cot_inputbox('text', 'rusertimezone', $urr['user_timezone'], array('size' => 32, 'maxlength' => 16)),
View
4 system/users/users.functions.php
@@ -206,12 +206,10 @@ function cot_generate_usertags($user_data, $tag_prefix = '', $emptyname='', $all
'MAINGRP' => cot_build_group($user_data['user_maingrp']),
'MAINGRPID' => $user_data['user_maingrp'],
'MAINGRPSTARS' => cot_build_stars($cot_groups[$user_data['user_maingrp']]['level']),
- 'MAINGRPICON' => cot_build_userimage($cot_groups[$user_data['user_maingrp']]['icon']),
+ 'MAINGRPICON' => cot_build_groupicon($cot_groups[$user_data['user_maingrp']]['icon']),
'COUNTRY' => cot_build_country($user_data['user_country']),
'COUNTRYFLAG' => cot_build_flag($user_data['user_country']),
'TEXT' => $cfg['parsebbcodeusertext'] ? cot_parse($user_data['user_text'], true) : $user_data['user_text'],
- 'AVATAR' => cot_build_userimage($user_data['user_avatar'], 'avatar'),
- 'PHOTO' => cot_build_userimage($user_data['user_photo'], 'photo'),
'EMAIL' => cot_build_email($user_data['user_email'], $user_data['user_hideemail']),
'THEME' => $user_data['user_theme'],
'SCHEME' => $user_data['user_scheme'],
View
22 system/users/users.resources.php
@@ -20,26 +20,4 @@
* User's profile resources
*/
-$R['users_code_avatar'] = '{$avatar_existing}'.$L['pro_avatarsupload'].' ('.$cfg['av_maxx'].'x'.$cfg['av_maxy'].'x'
- .$cfg['av_maxsize'].$L['b'].')<br />{$input_maxsize}{$input_file}<br />';
-$R['users_code_avatar_existing'] = '<img src="{$avatar_url}" alt="'.$L['Avatar'].'" /><br />'.$L['Delete']
- .' [<a href="{$delete_url}">x</a>]<br />&nbsp;<br />';
-
-$R['users_code_avatarchoose_title'] = '<a name="list" id="list"></a><h4>'.$L['pro_avatarschoose'].':</h4>';
-
-$R['users_code_photo'] = '{$photo_existing}'.$L['pro_photoupload'].' ('.$cfg['ph_maxx'].'x'.$cfg['ph_maxy'].'x'
- .$cfg['ph_maxsize'].$L['b'].')<br />{$input_maxsize}{$input_file}<br />';
-$R['users_code_photo_existing'] = '<img src="{$photo_url}" alt="'.$L['Photo'].'" /><br />'.$L['Delete']
- .' [<a href="{$delete_url}">x</a>]<br />&nbsp;<br />';
-
-$R['users_code_signature'] = '{$signature_existing}'.$L['pro_sigupload'].' ('.$cfg['sig_maxx'].'x'.$cfg['sig_maxy'].'x'
- .$cfg['sig_maxsize'].$L['b'].')<br />{$input_maxsize}{$input_file}<br />';
-$R['users_code_signature_existing'] = '<img src="{$signature_url}" alt="'.$L['Signature'].'" /><br />'.$L['Delete']
- .' [<a href="{$delete_url}">x</a>]<br />&nbsp;<br />';
-
-$R['users_link_avatar'] = '<a name="avatar" id="avatar"></a>';
-$R['users_link_avatarchoose'] = '<a href="{$url}">'.$L['pro_avatarspreset'].'</a>';
-$R['users_link_avatarselect'] = '<a href="{$url}"><img src="'.$cfg['defav_dir'].'{$f}" alt="'.$L['Avatar'].'" /></a>';
-$R['users_link_photo'] = '<a name="photo" id="photo"></a>';
-$R['users_link_signature'] = '<a name="signature" id="signature"></a>';
?>
Please sign in to comment.
Something went wrong with that request. Please try again.