clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

progress on photos

This commit is contained in:
Mike Macgirvin 2010-08-05 21:15:24 -07:00
parent 40a06771ff
commit 72b20a6eb1
10 changed files with 559 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.htaccess
View File

@ -1,5 +1,6 @@
Options -Indexes
AddType application/x-java-archive .jar
<IfModule mod_rewrite.c>
RewriteEngine on

12
database.sql
View File

@ -40,9 +40,9 @@ CREATE TABLE IF NOT EXISTS `contact` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`uid` int(11) NOT NULL COMMENT 'owner uid',
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`self` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'boolean 1 == info for local UID, primarily name and photo to use in item displays.',
`self` tinyint(1) NOT NULL DEFAULT '0',
`name` char(255) NOT NULL,
`photo` text NOT NULL COMMENT 'remote photo URL initially until approved',
`photo` text NOT NULL,
`thumb` text NOT NULL,
`site-pubkey` text NOT NULL,
`issued-id` char(255) NOT NULL,
@ -64,9 +64,9 @@ CREATE TABLE IF NOT EXISTS `contact` (
`blocked` tinyint(1) NOT NULL DEFAULT '1',
`readonly` tinyint(1) NOT NULL DEFAULT '0',
`pending` tinyint(1) NOT NULL DEFAULT '1',
`rating` tinyint(1) NOT NULL DEFAULT '0' COMMENT '0-5 reputation, 0 unknown, 1 call police, 5 inscrutable',
`reason` text NOT NULL COMMENT 'why a rating was given - will help friends decide to make friends or not',
`profile-id` int(11) NOT NULL DEFAULT '0' COMMENT 'which profile to display - 0 is public default',
`rating` tinyint(1) NOT NULL DEFAULT '0',
`reason` text NOT NULL,
`profile-id` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@ -141,6 +141,8 @@ CREATE TABLE IF NOT EXISTS `item` (
`title` char(255) NOT NULL,
`body` text NOT NULL,
`resource-id` char(255) NOT NULL,
`like` mediumtext NOT NULL,
`tag` mediumtext NOT NULL,
`allow_cid` mediumtext NOT NULL,
`allow_gid` mediumtext NOT NULL,
`deny_cid` mediumtext NOT NULL,

BIN
jumploader_z.jar Normal file
View File

Binary file not shown.

423
mod/photos.php Normal file
View File

@ -0,0 +1,423 @@
<?php
require_once('Photo.php');
function photos_init(&$a) {
if($a->argc > 1) {
$nick = $a->argv[1];
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
dbesc($nick)
);
if(! count($r))
return;
$a->data['user'] = $r[0];
$albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d",
intval($a->data['user']['uid'])
);
if(count($albums)) {
$a->data['albums'] = $albums;
$o .= '<h4><a href="' . $a->get_baseurl() . '/profile/' . $a->data['user']['nickname'] . '">' . $a->data['user']['username'] . '</a></h4>';
$o .= '<h4>' . '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '">' . t('Photo Albums') . '</a></h4>';
$o .= '<ul>';
foreach($albums as $album) {
if((! strlen($album['album'])) || ($album['album'] == t('Contact Photos')))
continue;
$o .= '<li>' . '<a href="photos/' . $a->argv[1] . '/album/' . bin2hex($album['album']) . '" />' . $album['album'] . '</a></li>';
}
$o .= '</ul>';
}
$a->page['aside'] .= $o;
}
}
function photos_post(&$a) {
if(! local_user()) {
notice( t('Permission denied.') . EOL );
killme();
}
$r = q("SELECT * FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` WHERE `user`.`uid` = %d AND `self` = 1 LIMIT 1",
intval($_SESSION['uid'])
);
$contact_record = $r[0];
if(! x($_FILES,'userfile'))
killme();
if($_POST['partitionCount'])
$java_upload = true;
else
$java_upload = false;
$album = notags(trim($_POST['album']));
$newalbum = notags(trim($_POST['newalbum']));
if(! strlen($album)) {
if(strlen($newalbum))
$album = $newalbum;
else
$album = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
}
$src = $_FILES['userfile']['tmp_name'];
$filename = basename($_FILES['userfile']['name']);
$filesize = intval($_FILES['userfile']['size']);
$imagedata = @file_get_contents($src);
$ph = new Photo($imagedata);
if(! ($image = $ph->getImage())) {
notice( t('Unable to process image.') . EOL );
@unlink($src);
killme();
}
@unlink($src);
$width = $ph->getWidth();
$height = $ph->getHeight();
$smallest = 0;
$photo_hash = hash('md5',uniqid(mt_rand(),true));
$r = $ph->store($_SESSION['uid'], 0, $photo_hash, $filename, $album, 0 );
if(! $r) {
notice( t('Image upload failed.') . EOL );
killme();
}
if($width > 640 || $height > 640) {
$ph->scaleImage(640);
$ph->store($_SESSION['uid'], 0, $photo_hash, $filename, $album, 1 );
$smallest = 1;
}
if($width > 320 || $height > 320) {
$ph->scaleImage(320);
$ph->store($_SESSION['uid'], 0, $photo_hash, $filename, $album, 2 );
$smallest = 2;
}
$basename = basename($filename);
// Create item container
$body = '[url=' . $a->get_baseurl() . '/photos/' . $contact_record['nickname'] . '/image/' . $photo_hash . ']'
. '[img]' . $a->get_baseurl() . "/photo/{$photo_hash}-{$smallest}.jpg" . '[/img]'
. '[/url]';
do {
$dups = false;
$item_hash = random_string();
$uri = "urn:X-dfrn:" . $a->get_hostname() . ':' . $profile_uid . ':' . $item_hash;
$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
dbesc($uri));
if(count($r))
$dups = true;
} while($dups == true);
$r = q("INSERT INTO `item` (`uid`, `type`, `resource-id`, `contact-id`,`owner-name`,`owner-link`,`owner-avatar`, `created`,
`edited`, `uri`, `parent-uri`, `title`, `body`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`)
VALUES( %d, '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
intval($_SESSION['uid']),
dbesc('photo'),
dbesc($photo_hash),
intval($contact_record['id']),
dbesc($contact_record['name']),
dbesc($contact_record['url']),
dbesc($contact_record['thumb']),
datetime_convert(),
datetime_convert(),
dbesc($uri),
dbesc($uri),
dbesc($title),
dbesc($body),
dbesc($str_contact_allow),
dbesc($str_group_allow),
dbesc($str_contact_deny),
dbesc($str_group_deny)
);
if($r) {
$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
dbesc($uri)
);
if(count($r))
q("UPDATE `item` SET `parent` = %d, `last-child` = 1 WHERE `id` = %d LIMIT 1",
intval($r[0]['id']),
intval($r[0]['id'])
);
}
// if album has no featured photo, promote one.
if(! $java_upload) {
goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
return; // NOTREACHED
}
killme();
return; // NOTREACHED
}
function photos_content(&$a) {
// URLs:
// photos/name
// photos/name/upload
// photos/name/album/xxxxx
// photos/name/album/xxxxx/edit
// photos/name/album/xxxxx/drop
// photos/name/image/xxxxx
// photos/name/image/xxxxx/edit
// photos/name/image/xxxxx/drop
if(! x($a->data,'user')) {
notice( t('No photos selected') . EOL );
return;
}
$_SESSION['photo_return'] = $a->cmd;
//
// Parse arguments
//
if($a->argc > 3) {
$datatype = $a->argv[2];
$datum = $a->argv[3];
}
elseif(($a->argc > 2) && ($a->argv[2] == 'upload'))
$datatype = 'upload';
else
$datatype = 'summary';
if($a->argc > 4)
$cmd = $a->argv[4];
else
$cmd = 'view';
//
// Setup permissions structures
//
$owner_uid = $a->data['user']['uid'];
if(remote_user()) {
$contact_id = $_SESSION['visitor_id'];
$groups = init_groups_visitor($contact_id);
}
// default permissions - anonymous user
$sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = '' ";
// Profile owner - everything is visible
if(local_user() && ($_SESSION['uid'] == $owner_uid)) {
$sql_extra = '';
}
elseif(remote_user()) {
// authenticated visitor - here lie dragons
$gs = '<<>>'; // should be impossible to match
if(count($groups)) {
foreach($groups as $g)
$gs .= '|<' . intval($g) . '>';
}
$sql_extra = sprintf(
" AND ( `allow_cid` = '' OR `allow_cid` REGEXP '<%d>' )
AND ( `deny_cid` = '' OR NOT `deny_cid` REGEXP '<%d>' )
AND ( `allow_gid` = '' OR `allow_gid` REGEXP '%s' )
AND ( `deny_gid` = '' OR NOT `deny_gid` REGEXP '%s') ",
intval($_SESSION['visitor_id']),
intval($_SESSION['visitor_id']),
dbesc($gs),
dbesc($gs)
);
}
//
// dispatch request
//
if($datatype == 'upload') {
if( ! (local_user() && ($_SESSION['uid'] == $a->data['user']['uid']))) {
notice( t('Permission denied.'));
return;
}
$albumselect = '<select id="photos-upload-album-select" name="album" size="4">';
$albumselect .= '<option value="" selected="selected" >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
if(count($a->data['albums'])) {
foreach($a->data['albums'] as $album) {
if(($album['album'] == '') || ($album['album'] == t('Contact Photos')))
continue;
$albumselect .= '<option value="' . $album['album'] . '">' . $album['album'] . '</option>';
}
}
$albumselect .= '</select>';
$tpl = file_get_contents('view/photos_upload.tpl');
$o .= replace_macros($tpl,array(
'$pagename' => t('Upload Photos'),
'$sessid' => session_id(),
'$newalbum' => t('New album name: '),
'$existalbumtext' => t('or existing album name: '),
'$filestext' => t('Select files to upload: '),
'$albumselect' => $albumselect,
'$archive' => $a->get_baseurl() . '/jumploader_z.jar',
'$nojava' => t('Use the following controls only if the Java uploader (above) fails to launch.'),
'$uploadurl' => $a->get_baseurl() . '/photos',
'$submit' => t('Submit')
));
return $o;
}
if($datatype == 'album') {
$album = hex2bin($datum);
$r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s'
$sql_extra GROUP BY `resource-id`",
intval($a->data['user']['uid']),
dbesc($album)
);
if(count($r))
$a->set_pager_total(count($r));
$r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s'
$sql_extra GROUP BY `resource-id` LIMIT %d , %d",
intval($a->data['user']['uid']),
dbesc($album),
intval($a->pager['start']),
intval($a->pager['itemspage'])
);
$o .= '<h3>' . $album . '</h3>';
$tpl = file_get_contents('view/photo_album.tpl');
if(count($r))
foreach($r as $rr) {
$o .= replace_macros($tpl,array(
'$id' => $rr['id'],
'$photolink' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
'$phototitle' => t('View Photo'),
'$imgsrc' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.jpg',
'$imgalt' => $rr['filename']
));
}
$o .= '<div id="photo-album-end"></div>';
return $o;
}
if($datatype == 'image') {
// fetch item containing image, then comments
$r = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'
$sql_extra ORDER BY `scale` ASC ",
intval($a->data['user']['uid']),
dbesc($datum)
);
if(! count($r)) {
notice( t('Photo not available') . EOL );
return;
}
if(count($r) == 1)
$hires = $lores = $r[0];
if(count($r) > 1) {
$hires = $r[0];
$lores = $r[1];
}
$o .= '<a href="' . $a->get_baseurl() . '/photo/'
. $hires['resource-id'] . '-' . $hires['scale'] . '.jpg" title="'
. t('View Full Size') . '" ><img src="' . $a->get_baseurl() . '/photo/'
. $lores['resource-id'] . '-' . $lores['scale'] . '.jpg' . '" /></a>';
return $o;
}
// Default - show recent photos with upload link (if applicable)
$r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s'
$sql_extra GROUP BY `resource-id`",
intval($a->data['user']['uid']),
dbesc( t('Contact Photos'))
);
if(count($r))
$a->set_pager_total(count($r));
$r = q("SELECT `resource-id`, `album`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s'
$sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d",
intval($a->data['user']['uid']),
dbesc( t('Contact Photos')),
intval($a->pager['start']),
intval($a->pager['itemspage'])
);
$o .= '<h3>' . t('Recent Photos') . '</h3>';
if( local_user() && ($_SESSION['uid'] == $a->data['user']['uid'])) {
$o .= '<div id="photo-top-links"><a id="photo-top-upload-link" href="'. $a->get_baseurl() . '/photos/'
. $a->data['user']['nickname'] . '/upload' . '">' . t('Upload New Photos') . '</a></div>';
}
$tpl = file_get_contents('view/photo_top.tpl');
if(count($r)) {
foreach($r as $rr) {
$o .= replace_macros($tpl,array(
'$id' => $rr['id'],
'$photolink' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname']
. '/image/' . $rr['resource-id'],
'$phototitle' => t('View Photo'),
'$imgsrc' => $a->get_baseurl() . '/photo/'
. $rr['resource-id'] . '-' . $rr['scale'] . '.jpg',
'$albumlink' => $a->get_baseurl . '/photos/'
. $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
'$albumname' => $rr['album'],
'$albumalt' => t('View Album'),
'$imgalt' => $rr['filename']
));
}
$o .= '<div id="photo-top-end"></div>';
}
return $o;
}

3
mod/profile.php
View File

@ -106,7 +106,8 @@ function profile_content(&$a, $update = false) {
$tpl = file_get_contents('view/profile_tabs.tpl');
$o .= replace_macros($tpl,array(
'$url' => $a->get_baseurl() . '/' . $a->cmd
'$url' => $a->get_baseurl() . '/' . $a->cmd,
'$phototab' => $a->get_baseurl() . '/photos/' . $a->profile['nickname']
));

5
view/photo_album.tpl Normal file
View File

@ -0,0 +1,5 @@
<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-$id">
<a href="$photolink" class="photo-album-photo-link" id="photo-album-photo-link-$id" title="$phototitle"><img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo" id="photo-album-photo-$id" /></a>
</div>
<div class="photo-album-image-wrapper-end"></div>

6
view/photo_top.tpl Normal file
View File

@ -0,0 +1,6 @@
<div class="photo-top-image-wrapper" id="photo-top-image-wrapper-$id">
<a href="$photolink" class="photo-top-photo-link" id="photo-top-photo-link-$id" title="$phototitle"><img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-top-photo" id="photo-top-photo-$id" /></a>
<div class="photo-top-album-name"><a href="$albumlink" class="photo-top-album-link" title="$albumalt" >$albumname</a></div>
</div>
<div class="photo-top-image-wrapper-end"></div>

53
view/photos_upload.tpl Normal file
View File

@ -0,0 +1,53 @@
<h3>$pagename</h3>
<form action="photos" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
<div id="photos-upload-new-wrapper" >
<div id="photos-upload-newalbum-div">
<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >$newalbum</label>
</div>
<input id="photos-upload-newalbum" type="text" name="newalbum" />
</div>
<div id="photos-upload-new-end"></div>
<div id="photos-upload-exist-wrapper">
<div id="photos-upload-existing-album-text">$existalbumtext</div>
$albumselect
</div>
<div id="photos-upload-exist-end"></div>
<div id="photos-upload-select-files-text">$filestext</div>
<div id="photos_upload_applet_wrapper">
<applet name="jumpLoaderApplet"
code="jmaster.jumploader.app.JumpLoaderApplet.class"
archive="$archive"
width="700"
height="600"
mayscript >
<param name="uc_uploadUrl" value="$uploadurl" />
<param name="uc_uploadFormName" value="photos-upload-form" />
<param name="gc_loggingLeveL" value="FATAL" />
<param name="uc_fileParameterName" value="userfile" />
<param name="uc_cookie" value="PHPSESSID=$sessid; path=/;" />
<param name="vc_disableLocalFileSystem" value="false" />
<param name="vc_uploadViewMenuBarVisible" value="false" />
<param name="vc_mainViewFileListViewVisible" value="true" />
<param name="vc_mainViewFileListViewHeightPercent" value="50" />
<param name="vc_mainViewFileTreeViewVisible" value="true" />
<param name="vc_mainViewFileTreeViewWidthPercent" value="35" />
<param name="vc_lookAndFeel" value="system" />
</applet>
</div>
<div id="photos-upload-no-java-message" >
$nojava
</div>
<input type="file" name="userfile" />
<div class="photos-upload-submit-wrapper" >
<input type="submit" name="submit" value="$submit" id="photos-upload-submit" />
</div>
<div class="photos-upload-end" ></div>
</form>

2
view/profile_tabs.tpl
View File

@ -2,5 +2,5 @@
<div id="profile-tabs-wrapper" >
<a href="$url" id="profile-tab-status-link" class="profile-tabs" >Status</a>
<a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs" >Profile</a>
<a href="$url?tab=photos" id="profile-tab-photos-link" class="profile-tabs" >Photos</a>
<a href="$phototab" id="profile-tab-photos-link" class="profile-tabs" >Photos</a>
<div id="profile-tabs-end"></div>

62
view/style.css
View File

@ -1217,4 +1217,64 @@ input#dfrn-url {
}
#sidebar-group-list li {
margin-top: 10px;
margin-top: 10px;
}
.photo-album-image-wrapper {
float: left;
margin-top: 15px;
height: 350px;
width: 350px;
}
#photo-album-end {
clear: both;
}
.photo-top-image-wrapper {
float: left;
margin-top: 15px;
height: 350px;
width: 350px;
}
#photo-top-end {
clear: both;
}
#photo-top-links {
margin-bottom: 30px;
margin-left: 30px;
}
#photos-upload-newalbum-div {
float: left;
width: 175px;
}
#photos-upload-existing-album-text {
float: left;
width: 175px;
}
#photos-upload-newalbum {
float: left;
}
#photos-upload-album-select {
float: left;
}
#photos-upload-new-end, #photos-upload-exist-end {
clear: both;
}
#photos-upload-exist-end {
margin-bottom: 15px;
}
#photos-upload-submit {
margin-top: 15px;
}
#photos_upload_applet_wrapper {
margin-bottom: 15px;
}
#photos-upload-no-java-message {
margin-bottom: 15px;
}