mirror of
https://github.com/e107inc/e107.git
synced 2025-08-03 21:27:25 +02:00
Better avatar handling, code cleanup
This commit is contained in:
@@ -24,5 +24,10 @@ else
|
|||||||
{
|
{
|
||||||
$image = USERIMAGE;
|
$image = USERIMAGE;
|
||||||
}
|
}
|
||||||
require_once(e_HANDLER."avatar_handler.php");
|
if(!$image) { return; }
|
||||||
return "<div class='spacer'><img src='".avatar($image)."' alt='' /></div><br />";
|
require_once(e_HANDLER.'avatar_handler.php');
|
||||||
|
$avatar = avatar($image);
|
||||||
|
if($avatar)
|
||||||
|
{
|
||||||
|
return "<div class='spacer'><img src='".avatar($image)."' alt='' /></div><br />";
|
||||||
|
}
|
||||||
|
@@ -11,27 +11,37 @@
|
|||||||
| GNU General Public License (http://gnu.org).
|
| GNU General Public License (http://gnu.org).
|
||||||
|
|
|
|
||||||
| $Source: /cvs_backup/e107_0.8/e107_handlers/avatar_handler.php,v $
|
| $Source: /cvs_backup/e107_0.8/e107_handlers/avatar_handler.php,v $
|
||||||
| $Revision: 1.1.1.1 $
|
| $Revision: 1.2 $
|
||||||
| $Date: 2006-12-02 04:33:42 $
|
| $Date: 2008-12-10 16:37:17 $
|
||||||
| $Author: mcfly_e107 $
|
| $Author: mcfly_e107 $
|
||||||
+----------------------------------------------------------------------------+
|
+----------------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
if (!defined('e107_INIT')) { exit; }
|
if (!defined('e107_INIT'))
|
||||||
|
{
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
function avatar($avatar) {
|
function avatar($avatar)
|
||||||
|
{
|
||||||
global $tp;
|
global $tp;
|
||||||
if (stristr($avatar, "-upload-") !== FALSE) {
|
if (stristr($avatar, '-upload-') !== false)
|
||||||
return e_FILE."public/avatars/".str_replace("-upload-", "", $avatar);
|
{
|
||||||
} else if (stristr($avatar, "Binary") !== FALSE) {
|
return e_FILE.'public/avatars/'.str_replace('-upload-', '', $avatar);
|
||||||
|
}
|
||||||
|
elseif (stristr($avatar, 'Binary') !== false)
|
||||||
|
{
|
||||||
$sqla = new db;
|
$sqla = new db;
|
||||||
preg_match("/Binary\s(.*?)\//", $avatar, $result);
|
preg_match("/Binary\s(.*?)\//", $avatar, $result);
|
||||||
$sqla->db_Select("rbinary", "*", "binary_id='".$tp -> toDB($result[1])."' ");
|
$sqla->db_Select('rbinary', '*', "binary_id='".$tp->toDB($result[1])."' ");
|
||||||
$row = $sqla->db_Fetch();
|
$row = $sqla->db_Fetch();
|
||||||
extract($row);
|
return $row['binary_data'];
|
||||||
return $binary_data;
|
}
|
||||||
} else if (strpos($avatar, "http://") === FALSE) {
|
elseif (strpos($avatar, 'http://') === false)
|
||||||
|
{
|
||||||
return e_IMAGE."avatars/".$avatar;
|
return e_IMAGE."avatars/".$avatar;
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
return $avatar;
|
return $avatar;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -11,9 +11,9 @@
|
|||||||
| GNU General Public License (http://gnu.org).
|
| GNU General Public License (http://gnu.org).
|
||||||
|
|
|
|
||||||
| $Source: /cvs_backup/e107_0.8/e107_plugins/login_menu/login_menu_template.php,v $
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/login_menu/login_menu_template.php,v $
|
||||||
| $Revision: 1.5 $
|
| $Revision: 1.6 $
|
||||||
| $Date: 2008-06-13 20:20:22 $
|
| $Date: 2008-12-10 16:37:17 $
|
||||||
| $Author: e107steved $
|
| $Author: mcfly_e107 $
|
||||||
+----------------------------------------------------------------------------+
|
+----------------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
1062
usersettings.php
1062
usersettings.php
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user