Merge branch 'chriscase-master'

[friendica.git] / mod / profile_photo.php

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 39808776b7e4fad331db8a0cc9028221b3f73a97..4f0d567f407a265bf0cf8441e8ff532a33f52260 100644 (file)
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -8,7 +8,6 @@ function profile_photo_init(&$a) {
                return;
        }
 
-       require_once("mod/profile.php");
        profile_load($a,$a->user['nickname']);
 
 }
@@ -91,8 +90,8 @@ function profile_photo_post(&$a) {
                                $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_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",array(),$foo));
+                                       proc_run($php_path,"include/directory.php","$url");
                        }
                        else
                                notice( t('Unable to process image') . EOL);
@@ -124,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();
 
@@ -149,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
@@ -160,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