Merge branch 'friendika-master'
This commit is contained in:
fabrixxm
commit
97b608db38
4
boot.php
4
boot.php
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
set_time_limit(0);
|
||||
|
||||
define ( 'BUILD_ID', 1034 );
|
||||
define ( 'FRIENDIKA_VERSION', '2.10.0904' );
|
||||
define ( 'BUILD_ID', 1035 );
|
||||
define ( 'FRIENDIKA_VERSION', '2.10.0905' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.1' );
|
||||
|
||||
define ( 'EOL', "<br />\r\n" );
|
||||
|
|
|
|||
|
|
@ -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`.`id` AS `contact-id`, `contact`.`uid` AS `contact-uid`
|
||||
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`.`edited` > '%s' OR `item`.`changed` > '%s' )
|
||||
$sql_extra
|
||||
|
|
|
|||
|
|
@ -82,6 +82,8 @@ function network_content(&$a, $update = 0) {
|
|||
$jotplugins = "";
|
||||
call_hooks('jot_tool', $jotplugins);
|
||||
|
||||
$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
|
||||
|
||||
$o .= replace_macros($tpl,array(
|
||||
'$return_path' => $a->cmd,
|
||||
'$baseurl' => $a->get_baseurl(),
|
||||
|
|
@ -92,8 +94,7 @@ function network_content(&$a, $update = 0) {
|
|||
'$lockstate' => $lockstate,
|
||||
'$acl' => populate_acl((($group) ? $group_acl : $a->user), $celeb),
|
||||
'$bang' => (($group) ? '!' : ''),
|
||||
'$profile_uid' => $_SESSION['uid'],
|
||||
'$jotplugins' => $jotplugins
|
||||
'$profile_uid' => $_SESSION['uid']
|
||||
));
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -915,6 +915,7 @@ function photos_content(&$a) {
|
|||
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 .= ' - <a id="photo-toprofile-link" href="' . $a->get_baseurl() . '/profile_photo/use/'.$ph[0]['resource-id'].'">'.t('Use as profile photo').'</a>';
|
||||
// lock
|
||||
$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'])) )
|
||||
|
|
|
|||
|
|
@ -138,6 +138,8 @@ function profile_content(&$a, $update = 0) {
|
|||
$jotplugins = "";
|
||||
call_hooks('jot_tool', $jotplugins);
|
||||
|
||||
$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
|
||||
|
||||
$o .= replace_macros($tpl,array(
|
||||
'$baseurl' => $a->get_baseurl(),
|
||||
'$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'),
|
||||
'$bang' => '',
|
||||
'$acl' => (($is_owner) ? populate_acl($a->user, $celeb) : ''),
|
||||
'$profile_uid' => $a->profile['profile_uid'],
|
||||
'$jotplugins' => $jotplugins
|
||||
'$profile_uid' => $a->profile['profile_uid']
|
||||
));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -123,7 +123,95 @@ function profile_photo_post(&$a) {
|
|||
}
|
||||
|
||||
@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();
|
||||
$height = $ph->getHeight();
|
||||
|
||||
|
|
@ -159,39 +247,5 @@ function profile_photo_post(&$a) {
|
|||
$a->config['imagecrop_resolution'] = $smallest;
|
||||
$a->page['htmlhead'] .= load_view_file("view/crophead.tpl");
|
||||
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
|
||||
}}
|
||||
|
||||
|
|
|
|||
14
update.php
14
update.php
|
|
@ -328,3 +328,17 @@ function update_1033() {
|
|||
`updated` DATETIME NOT NULL
|
||||
) 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");
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,3 +12,7 @@
|
|||
</div>
|
||||
|
||||
</form>
|
||||
|
||||
<div id="profile-photo-link-select-wrapper">
|
||||
oder <a href='photos/$user'>wähle ein Bild aus einem Album</a>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -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['photo'] = 'Foto';
|
||||
$a->strings['status'] = 'Status';
|
||||
$a->strings['likes'] = 'mag es';
|
||||
$a->strings['doesn\'t like'] = 'mag es nicht';
|
||||
$a->strings['likes'] = 'mag das';
|
||||
$a->strings['doesn\'t like'] = 'mag das nicht';
|
||||
$a->strings['\'s'] = '\'s';
|
||||
$a->strings['Remote privacy information not available.'] = 'Entfernte Privatsphäreneinstellungen nicht verfügbar.';
|
||||
$a->strings['Visible to:'] = 'Sichtbar für:';
|
||||
|
|
|
|||
|
|
@ -12,3 +12,7 @@
|
|||
</div>
|
||||
|
||||
</form>
|
||||
|
||||
<div id="profile-photo-link-select-wrapper">
|
||||
or <a href='photos/$user'>select a photo from albums</a>
|
||||
</div>
|
||||
|
|
@ -12,3 +12,7 @@
|
|||
</div>
|
||||
|
||||
</form>
|
||||
|
||||
<div id="profile-photo-link-select-wrapper">
|
||||
or <a href='photos/$user'>select a photo from albums</a>
|
||||
</div>
|
||||
|
|
@ -293,7 +293,7 @@ $a->strings['Edit Album'] = 'Éditer l\'album';
|
|||
$a->strings['View Photo'] = 'Voir la photo';
|
||||
$a->strings['Photo not available'] = 'Photo indisponible';
|
||||
$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['Tags: '] = 'Étiquettes: ';
|
||||
$a->strings['[Remove any tag]'] = '[Retirer toutes les étiquettes]';
|
||||
|
|
|
|||
|
|
@ -734,6 +734,10 @@ input#dfrn-url {
|
|||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
#profile-photo-link-select-wrapper {
|
||||
margin-top: 2em;
|
||||
}
|
||||
|
||||
#profile-edit-profile-name-label,
|
||||
#profile-edit-name-label,
|
||||
#profile-edit-pdesc-label,
|
||||
|
|
|
|||
|
|
@ -602,6 +602,10 @@ input#dfrn-url {
|
|||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
#profile-photo-link-select-wrapper {
|
||||
margin-top: 2em;
|
||||
}
|
||||
|
||||
#profile-edit-profile-name-label,
|
||||
#profile-edit-name-label,
|
||||
#profile-edit-pdesc-label,
|
||||
|
|
@ -1853,8 +1857,6 @@ a.mail-list-link {
|
|||
margin-bottom: 25px;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* end from defautlt */
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user