stuff to make connecting to diaspora profiles easier

[friendica.git] / mod / profile_photo.php

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 1bf4e176b83473e191d87b2bb0bb960b87b2d413..68c05625b3e732235d45de1f1fb0b9141802d762 100644 (file)
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -58,21 +58,21 @@ function profile_photo_post(&$a) {
                                $r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 4, 1);
 
                                if($r === false)
-                                       notice ( t('Image size reduction [175] failed.') . EOL );
+                                       notice ( sprintf(t('Image size reduction [%s] failed.'),"175") . EOL );
 
                                $im->scaleImage(80);
 
                                $r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 5, 1);
                        
                                if($r === false)
-                                       notice( t('Image size reduction [80] failed.') . EOL );
+                                       notice( sprintf(t('Image size reduction [%s] failed.'),"80") . EOL );
 
                                $im->scaleImage(48);
 
                                $r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 6, 1);
                        
                                if($r === false)
-                                       notice( t('Image size reduction [48] failed.') . EOL );
+                                       notice( sprintf(t('Image size reduction [%s] failed.'),"48") . EOL );
 
                                // Unset the profile photo flag from any other photos I own
 
@@ -87,11 +87,9 @@ function profile_photo_post(&$a) {
                                );
 
                                // Update global directory in background
-                               $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-                               $url = $_SESSION['my_url'];
+                               $url = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
                                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");
+                                       proc_run('php',"include/directory.php","$url");
                        }
                        else
                                notice( t('Unable to process image') . EOL);
@@ -108,7 +106,7 @@ function profile_photo_post(&$a) {
        $maximagesize = get_config('system','maximagesize');
 
        if(($maximagesize) && ($filesize > $maximagesize)) {
-               notice( t('Image exceeds size limit of ') . $maximagesize . EOL);
+               notice( sprintf(t('Image exceeds size limit of %d'), $maximagesize) . EOL);
                @unlink($src);
                return;
        }
@@ -169,11 +167,9 @@ function profile_photo_content(&$a) {
                        );
                        
                        // 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");
+                               proc_run('php',"include/directory.php","$url");
                        
                        goaway($a->get_baseurl() . '/profiles');
                        return; // NOTREACHED
@@ -188,7 +184,7 @@ function profile_photo_content(&$a) {
                $tpl = load_view_file('view/profile_photo.tpl');
 
                $o .= replace_macros($tpl,array(
-
+                       '$user' => $a->user['nickname']
                ));
 
                return $o;
@@ -238,7 +234,7 @@ function profile_photo_crop_ui_head(&$a, $ph){
                $r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 1 );   
                
                if($r === false)
-                       notice( t('Image size reduction [640] failed.') . EOL );
+                       notice( sprintf(t('Image size reduction [%s] failed.'),"640") . EOL );
                else
                        $smallest = 1;
        }