aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mod/photos.php3
-rw-r--r--mod/profile_photo.php126
-rw-r--r--view/de/profile_photo.tpl6
-rw-r--r--view/en/profile_photo.tpl6
-rw-r--r--view/fr/profile_photo.tpl6
-rw-r--r--view/fr/strings.php2
-rw-r--r--view/theme/default/style.css4
-rw-r--r--view/theme/duepuntozero/style.css6
8 files changed, 116 insertions, 43 deletions
diff --git a/mod/photos.php b/mod/photos.php
index 52cc66eae..1a1ebaac1 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -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'])) )
@@ -1064,7 +1065,7 @@ function photos_content(&$a) {
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']) : '');
$o .= '<div id="photo-like-div">';
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 8b72bfca0..4f0d567f4 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -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();
@@ -148,7 +236,7 @@ function profile_photo_post(&$a) {
if($width > 640 || $height > 640) {
$ph->scaleImage(640);
$r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 1 );
-
+
if($r === false)
notice( t('Image size reduction [640] failed.') . EOL );
else
@@ -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
-}} \ No newline at end of file
diff --git a/view/de/profile_photo.tpl b/view/de/profile_photo.tpl
index 958952240..fe74b4746 100644
--- a/view/de/profile_photo.tpl
+++ b/view/de/profile_photo.tpl
@@ -11,4 +11,8 @@
<input type="submit" name="submit" id="profile-photo-submit" value="Upload">
</div>
-</form> \ No newline at end of file
+</form>
+
+<div id="profile-photo-link-select-wrapper">
+or <a href='photos/$user'>select a photo from albums</a>
+</div> \ No newline at end of file
diff --git a/view/en/profile_photo.tpl b/view/en/profile_photo.tpl
index d518e7331..30e51210a 100644
--- a/view/en/profile_photo.tpl
+++ b/view/en/profile_photo.tpl
@@ -11,4 +11,8 @@
<input type="submit" name="submit" id="profile-photo-submit" value="Upload">
</div>
-</form> \ No newline at end of file
+</form>
+
+<div id="profile-photo-link-select-wrapper">
+or <a href='photos/$user'>select a photo from albums</a>
+</div> \ No newline at end of file
diff --git a/view/fr/profile_photo.tpl b/view/fr/profile_photo.tpl
index d518e7331..30e51210a 100644
--- a/view/fr/profile_photo.tpl
+++ b/view/fr/profile_photo.tpl
@@ -11,4 +11,8 @@
<input type="submit" name="submit" id="profile-photo-submit" value="Upload">
</div>
-</form> \ No newline at end of file
+</form>
+
+<div id="profile-photo-link-select-wrapper">
+or <a href='photos/$user'>select a photo from albums</a>
+</div> \ No newline at end of file
diff --git a/view/fr/strings.php b/view/fr/strings.php
index 39e15eccf..8bac6347f 100644
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
@@ -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]';
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index 61782f6e3..5dd0b8712 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -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,
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index a1098f6a4..c7eb56fb1 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -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 */
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 07:06:16 +0000