' . t('Edit photo') . ' ';
+ $o .= ' -
'.t('Use as profile photo').' ';
// 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 .= '
';
diff --git a/mod/profile.php b/mod/profile.php
index 91c1ba6d85..3b4616a34f 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -135,9 +135,11 @@ function profile_content(&$a, $update = 0) {
else
$lockstate = 'unlock';
- $jotplugins = "";
- call_hooks('jot_tool', $jotplugins);
-
+ $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']
));
}
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 8b72bfca06..4f0d567f40 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/update.php b/update.php
index f7bf9da1ed..f909837470 100644
--- a/update.php
+++ b/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");
+
+}
diff --git a/view/de/profile_photo.tpl b/view/de/profile_photo.tpl
index 9589522400..10d7d7b973 100644
--- a/view/de/profile_photo.tpl
+++ b/view/de/profile_photo.tpl
@@ -11,4 +11,8 @@
-
\ No newline at end of file
+
+
+
diff --git a/view/de/strings.php b/view/de/strings.php
index f59dcf63b9..bc31fab78a 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -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:';
diff --git a/view/en/profile_photo.tpl b/view/en/profile_photo.tpl
index d518e73312..30e51210a8 100644
--- a/view/en/profile_photo.tpl
+++ b/view/en/profile_photo.tpl
@@ -11,4 +11,8 @@