Merge branch 'friendika-master'

This commit is contained in:
fabrixxm 2011-02-06 21:27:24 +01:00
commit 97b608db38
14 changed files with 146 additions and 57 deletions

View file

@ -2,8 +2,8 @@
set_time_limit(0); set_time_limit(0);
define ( 'BUILD_ID', 1034 ); define ( 'BUILD_ID', 1035 );
define ( 'FRIENDIKA_VERSION', '2.10.0904' ); define ( 'FRIENDIKA_VERSION', '2.10.0905' );
define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' );
define ( 'EOL', "<br />\r\n" ); define ( 'EOL', "<br />\r\n" );

View file

@ -144,7 +144,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
`contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
`contact`.`id` AS `contact-id`, `contact`.`uid` AS `contact-uid` `contact`.`id` AS `contact-id`, `contact`.`uid` AS `contact-uid`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`parent` != 0
AND `item`.`wall` = 1 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `item`.`wall` = 1 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
AND ( `item`.`edited` > '%s' OR `item`.`changed` > '%s' ) AND ( `item`.`edited` > '%s' OR `item`.`changed` > '%s' )
$sql_extra $sql_extra

View file

@ -79,8 +79,10 @@ function network_content(&$a, $update = 0) {
$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
$jotplugins = ""; $jotplugins = "";
call_hooks('jot_tool', $jotplugins); call_hooks('jot_tool', $jotplugins);
$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$return_path' => $a->cmd, '$return_path' => $a->cmd,
@ -92,8 +94,7 @@ function network_content(&$a, $update = 0) {
'$lockstate' => $lockstate, '$lockstate' => $lockstate,
'$acl' => populate_acl((($group) ? $group_acl : $a->user), $celeb), '$acl' => populate_acl((($group) ? $group_acl : $a->user), $celeb),
'$bang' => (($group) ? '!' : ''), '$bang' => (($group) ? '!' : ''),
'$profile_uid' => $_SESSION['uid'], '$profile_uid' => $_SESSION['uid']
'$jotplugins' => $jotplugins
)); ));

View file

@ -915,6 +915,7 @@ function photos_content(&$a) {
if($can_post && ($ph[0]['uid'] == $owner_uid)) { if($can_post && ($ph[0]['uid'] == $owner_uid)) {
$o .= '<div id="photo-edit-link-wrap" ><a id="photo-edit-link" href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $datum . '/edit' . '">' . t('Edit photo') . '</a>'; $o .= '<div id="photo-edit-link-wrap" ><a id="photo-edit-link" href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $datum . '/edit' . '">' . t('Edit photo') . '</a>';
$o .= ' - <a id="photo-toprofile-link" href="' . $a->get_baseurl() . '/profile_photo/use/'.$ph[0]['resource-id'].'">'.t('Use as profile photo').'</a>';
// lock // lock
$o .= ( ( ($ph[0]['uid'] == local_user()) && (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid']) $o .= ( ( ($ph[0]['uid'] == local_user()) && (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid'])
|| strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) ) || strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) )
@ -1064,7 +1065,7 @@ function photos_content(&$a) {
like_puller($a,$item,$dlike,'dislike'); like_puller($a,$item,$dlike,'dislike');
} }
$like = ((isset($alike[$link_item['id']])) ? format_like($alike[$link_item['id']],$alike[$link_item['id'] . '-l'],'like',$link_item['id']) : ''); $like = ((isset($alike[$link_item['id']])) ? format_like($alike[$link_item['id']],$alike[$link_item['id'] . '-l'],'like',$link_item['id']) : '');
$dislike = ((isset($dlike[$link_item['id']])) ? format_like($dlike[$link_item['id']],$dlike[$link_item['id'] . '-l'],'dislike',$link_item['id']) : ''); $dislike = ((isset($dlike[$link_item['id']])) ? format_like($dlike[$link_item['id']],$dlike[$link_item['id'] . '-l'],'dislike',$link_item['id']) : '');
$o .= '<div id="photo-like-div">'; $o .= '<div id="photo-like-div">';

View file

@ -135,9 +135,11 @@ function profile_content(&$a, $update = 0) {
else else
$lockstate = 'unlock'; $lockstate = 'unlock';
$jotplugins = ""; $jotplugins = "";
call_hooks('jot_tool', $jotplugins); call_hooks('jot_tool', $jotplugins);
$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$baseurl' => $a->get_baseurl(), '$baseurl' => $a->get_baseurl(),
'$defloc' => (($is_owner) ? $a->user['default-location'] : ''), '$defloc' => (($is_owner) ? $a->user['default-location'] : ''),
@ -148,8 +150,7 @@ function profile_content(&$a, $update = 0) {
'$emtitle' => t('Example: bob@example.com, mary@example.com'), '$emtitle' => t('Example: bob@example.com, mary@example.com'),
'$bang' => '', '$bang' => '',
'$acl' => (($is_owner) ? populate_acl($a->user, $celeb) : ''), '$acl' => (($is_owner) ? populate_acl($a->user, $celeb) : ''),
'$profile_uid' => $a->profile['profile_uid'], '$profile_uid' => $a->profile['profile_uid']
'$jotplugins' => $jotplugins
)); ));
} }

View file

@ -123,7 +123,95 @@ function profile_photo_post(&$a) {
} }
@unlink($src); @unlink($src);
return profile_photo_crop_ui_head($a, $ph);
}
if(! function_exists('profile_photo_content')) {
function profile_photo_content(&$a) {
if(! local_user()) {
notice( t('Permission denied.') . EOL );
return;
}
if( $a->argv[1]=='use'){
if ($a->argc<3){
notice( t('Permission denied.') . EOL );
return;
};
$resource_id = $a->argv[2];
//die(":".local_user());
$r=q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' ORDER BY `scale` ASC",
intval(local_user()),
dbesc($resource_id)
);
if (!count($r)){
notice( t('Permission denied.') . EOL );
return;
}
// set an already uloaded photo as profile photo
// if photo is in 'Profile Photos', change it in db
if ($r[0]['album']== t('Profile Photos')){
$r=q("UPDATE `photo` SET `profile`=0 WHERE `profile`=1 AND `uid`=%d",
intval(local_user()));
$r=q("UPDATE `photo` SET `profile`=1 WHERE `uid` = %d AND `resource-id` = '%s'",
intval(local_user()),
dbesc($resource_id)
);
$r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d LIMIT 1",
dbesc(datetime_convert()),
intval(local_user())
);
// Update global directory in background
$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
$url = $_SESSION['my_url'];
if($url && strlen(get_config('system','directory_submit_url')))
//proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",array(),$foo));
proc_run($php_path,"include/directory.php","$url");
goaway($a->get_baseurl() . '/profiles');
return; // NOTREACHED
}
$ph = new Photo($r[0]['data']);
profile_photo_crop_ui_head($a, $ph);
// go ahead as we have jus uploaded a new photo to crop
}
if(! x($a->config,'imagecrop')) {
$tpl = load_view_file('view/profile_photo.tpl');
$o .= replace_macros($tpl,array(
'$user' => $a->user['nickname']
));
return $o;
}
else {
$filename = $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'] . '.jpg';
$resolution = $a->config['imagecrop_resolution'];
$tpl = load_view_file("view/cropbody.tpl");
$o .= replace_macros($tpl,array(
'$filename' => $filename,
'$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],
'$image_url' => $a->get_baseurl() . '/photo/' . $filename
));
return $o;
}
return; // NOTREACHED
}}
if(! function_exists('_crop_ui_head')) {
function profile_photo_crop_ui_head(&$a, $ph){
$width = $ph->getWidth(); $width = $ph->getWidth();
$height = $ph->getHeight(); $height = $ph->getHeight();
@ -148,7 +236,7 @@ function profile_photo_post(&$a) {
if($width > 640 || $height > 640) { if($width > 640 || $height > 640) {
$ph->scaleImage(640); $ph->scaleImage(640);
$r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 1 ); $r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 1 );
if($r === false) if($r === false)
notice( t('Image size reduction [640] failed.') . EOL ); notice( t('Image size reduction [640] failed.') . EOL );
else else
@ -159,39 +247,5 @@ function profile_photo_post(&$a) {
$a->config['imagecrop_resolution'] = $smallest; $a->config['imagecrop_resolution'] = $smallest;
$a->page['htmlhead'] .= load_view_file("view/crophead.tpl"); $a->page['htmlhead'] .= load_view_file("view/crophead.tpl");
return; return;
} }}
if(! function_exists('profile_photo_content')) {
function profile_photo_content(&$a) {
if(! local_user()) {
notice( t('Permission denied.') . EOL );
return;
}
if(! x($a->config,'imagecrop')) {
$tpl = load_view_file('view/profile_photo.tpl');
$o .= replace_macros($tpl,array(
));
return $o;
}
else {
$filename = $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'] . '.jpg';
$resolution = $a->config['imagecrop_resolution'];
$tpl = load_view_file("view/cropbody.tpl");
$o .= replace_macros($tpl,array(
'$filename' => $filename,
'$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],
'$image_url' => $a->get_baseurl() . '/photo/' . $filename
));
return $o;
}
return; // NOTREACHED
}}

View file

@ -328,3 +328,17 @@ function update_1033() {
`updated` DATETIME NOT NULL `updated` DATETIME NOT NULL
) ENGINE = MYISAM DEFAULT CHARSET=utf8;"); ) ENGINE = MYISAM DEFAULT CHARSET=utf8;");
} }
function update_1034() {
// If you have any of these parent-less posts they can cause problems, and
// we need to delete them. You can't see them anyway.
// Legitimate items will usually get re-created on the next
// pull from the hub.
// But don't get rid of a post that may have just come in
// and may not yet have the parent id set.
q("DELETE FROM `item` WHERE `parent` = 0 AND `created` < UTC_TIMESTAMP() - INTERVAL 2 MINUTE");
}

View file

@ -11,4 +11,8 @@
<input type="submit" name="submit" id="profile-photo-submit" value="Upload"> <input type="submit" name="submit" id="profile-photo-submit" value="Upload">
</div> </div>
</form> </form>
<div id="profile-photo-link-select-wrapper">
oder <a href='photos/$user'>wähle ein Bild aus einem Album</a>
</div>

View file

@ -227,8 +227,8 @@ $a->strings['Please contact the sender by replying to this post if you do not wi
$a->strings['posted an update.'] = 'posted an update.'; $a->strings['posted an update.'] = 'posted an update.';
$a->strings['photo'] = 'Foto'; $a->strings['photo'] = 'Foto';
$a->strings['status'] = 'Status'; $a->strings['status'] = 'Status';
$a->strings['likes'] = 'mag es'; $a->strings['likes'] = 'mag das';
$a->strings['doesn\'t like'] = 'mag es nicht'; $a->strings['doesn\'t like'] = 'mag das nicht';
$a->strings['\'s'] = '\'s'; $a->strings['\'s'] = '\'s';
$a->strings['Remote privacy information not available.'] = 'Entfernte Privatsphäreneinstellungen nicht verfügbar.'; $a->strings['Remote privacy information not available.'] = 'Entfernte Privatsphäreneinstellungen nicht verfügbar.';
$a->strings['Visible to:'] = 'Sichtbar für:'; $a->strings['Visible to:'] = 'Sichtbar für:';

View file

@ -11,4 +11,8 @@
<input type="submit" name="submit" id="profile-photo-submit" value="Upload"> <input type="submit" name="submit" id="profile-photo-submit" value="Upload">
</div> </div>
</form> </form>
<div id="profile-photo-link-select-wrapper">
or <a href='photos/$user'>select a photo from albums</a>
</div>

View file

@ -11,4 +11,8 @@
<input type="submit" name="submit" id="profile-photo-submit" value="Upload"> <input type="submit" name="submit" id="profile-photo-submit" value="Upload">
</div> </div>
</form> </form>
<div id="profile-photo-link-select-wrapper">
or <a href='photos/$user'>select a photo from albums</a>
</div>

View file

@ -293,7 +293,7 @@ $a->strings['Edit Album'] = 'Éditer l\'album';
$a->strings['View Photo'] = 'Voir la photo'; $a->strings['View Photo'] = 'Voir la photo';
$a->strings['Photo not available'] = 'Photo indisponible'; $a->strings['Photo not available'] = 'Photo indisponible';
$a->strings['Edit photo'] = 'Éditer la photo'; $a->strings['Edit photo'] = 'Éditer la photo';
$a->strings['New album name] = 'Nom du nuovel album'; $a->strings['New album name'] = 'Nom du nouvel album';
$a->strings['View Full Size'] = 'Voir en taille réelle'; $a->strings['View Full Size'] = 'Voir en taille réelle';
$a->strings['Tags: '] = 'Étiquettes: '; $a->strings['Tags: '] = 'Étiquettes: ';
$a->strings['[Remove any tag]'] = '[Retirer toutes les étiquettes]'; $a->strings['[Remove any tag]'] = '[Retirer toutes les étiquettes]';

View file

@ -734,6 +734,10 @@ input#dfrn-url {
margin-bottom: 20px; margin-bottom: 20px;
} }
#profile-photo-link-select-wrapper {
margin-top: 2em;
}
#profile-edit-profile-name-label, #profile-edit-profile-name-label,
#profile-edit-name-label, #profile-edit-name-label,
#profile-edit-pdesc-label, #profile-edit-pdesc-label,

View file

@ -602,6 +602,10 @@ input#dfrn-url {
margin-bottom: 20px; margin-bottom: 20px;
} }
#profile-photo-link-select-wrapper {
margin-top: 2em;
}
#profile-edit-profile-name-label, #profile-edit-profile-name-label,
#profile-edit-name-label, #profile-edit-name-label,
#profile-edit-pdesc-label, #profile-edit-pdesc-label,
@ -1853,8 +1857,6 @@ a.mail-list-link {
margin-bottom: 25px; margin-bottom: 25px;
} }
/* end from defautlt */ /* end from defautlt */