<?php
+
+if (!defined('GNUSOCIAL')) { exit(1); }
+
/**
* Table Definition for avatar
*/
-require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
class Avatar extends Managed_DataObject
{
- ###START_AUTOCODE
- /* the code below is auto generated do not remove the above tag */
-
public $__table = 'avatar'; // table name
public $profile_id; // int(4) primary_key not_null
public $original; // tinyint(1)
public $width; // int(4) primary_key not_null
public $height; // int(4) primary_key not_null
public $mediatype; // varchar(32) not_null
- public $filename; // varchar(255)
- public $url; // varchar(255) unique_key
+ public $filename; // varchar(191) not 255 because utf8mb4 takes more space
public $created; // datetime() not_null
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
-
- /* the code above is auto generated do not remove the tag below */
- ###END_AUTOCODE
public static function schemaDef()
{
'width' => array('type' => 'int', 'not null' => true, 'description' => 'image width'),
'height' => array('type' => 'int', 'not null' => true, 'description' => 'image height'),
'mediatype' => array('type' => 'varchar', 'length' => 32, 'not null' => true, 'description' => 'file type'),
- 'filename' => array('type' => 'varchar', 'length' => 255, 'description' => 'local filename, if local'),
- 'url' => array('type' => 'varchar', 'length' => 255, 'description' => 'avatar location'),
+ 'filename' => array('type' => 'varchar', 'length' => 191, 'description' => 'local filename, if local'),
'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
),
'primary key' => array('profile_id', 'width', 'height'),
'unique keys' => array(
- 'avatar_url_key' => array('url'),
+// 'avatar_filename_key' => array('filename'),
),
'foreign keys' => array(
'avatar_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
}
// We clean up the file, too
- function delete()
+ function delete($useWhere=false)
{
$filename = $this->filename;
- if (parent::delete() && file_exists(Avatar::path($filename))) {
+ if (file_exists(Avatar::path($filename))) {
@unlink(Avatar::path($filename));
}
+
+ return parent::delete($useWhere);
}
/*
*/
public static function byProfile(Profile $target, $width=null, $height=null)
{
- $width = (int) floor($width);
- $height = !is_null($height) ? (int) floor($height) : null;
+ $width = intval($width);
+ $height = !is_null($height) ? intval($height) : null;
if (is_null($height)) {
$height = $width;
}
$server = common_config('site', 'server');
}
- $ssl = common_config('avatar', 'ssl');
-
- if (is_null($ssl)) { // null -> guess
- if (common_config('site', 'ssl') == 'always' &&
- !common_config('avatar', 'server')) {
- $ssl = true;
- } else {
- $ssl = false;
- }
- }
+ $ssl = (common_config('avatar', 'ssl') || GNUsocial::useHTTPS());
$protocol = ($ssl) ? 'https' : 'http';
function displayUrl()
{
- $server = common_config('avatar', 'server');
- if ($server && !empty($this->filename)) {
- return Avatar::url($this->filename);
- } else {
- return $this->url;
- }
+ return Avatar::url($this->filename);
}
static function urlByProfile(Profile $target, $width=null, $height=null) {
}
static function newSize(Profile $target, $width) {
- $width = (int) floor($width);
+ $width = intval($width);
if ($width < 1 || $width > common_config('avatar', 'maxsize')) {
// TRANS: An error message when avatar size is unreasonable
throw new Exception(_m('Avatar size too large'));
}
+ // So far we only have square avatars and I don't have time to
+ // rewrite support for non-square ones right now ;)
+ $height = $width;
$original = Avatar::getUploaded($target);
- $imagefile = new ImageFile($target->id, Avatar::path($original->filename));
- $filename = $imagefile->resize($width);
+ $imagefile = new ImageFile(null, Avatar::path($original->filename));
+ $filename = Avatar::filename($target->getID(), image_type_to_extension($imagefile->preferredType()),
+ $width, common_timestamp());
+ $imagefile->resizeTo(Avatar::path($filename), array('width'=>$width, 'height'=>$height));
$scaled = clone($original);
$scaled->original = false;
$scaled->width = $width;
- $scaled->height = $width;
- $scaled->url = Avatar::url($filename);
+ $scaled->height = $height;
$scaled->filename = $filename;
$scaled->created = common_sql_now();