Cleanup /format pre-move

[friendica.git] / mod / profile_photo.php

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 371effd0cb0e961cd01675c899cdc53a64ade8b0..8b3d3d371e24ea1d0907cb0addfca14da7e3fb43 100644 (file)
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -2,20 +2,18 @@
 
 require_once("include/Photo.php");
 
-function profile_photo_init(&$a) {
+function profile_photo_init(App $a) {
 
-       if(! local_user()) {
+       if (! local_user()) {
                return;
        }
 
        profile_load($a,$a->user['nickname']);
-
 }
 
+function profile_photo_post(App $a) {
 
-function profile_photo_post(&$a) {
-
-       if(! local_user()) {
+       if (! local_user()) {
                notice ( t('Permission denied.') . EOL );
                return;
        }
@@ -73,22 +71,25 @@ function profile_photo_post(&$a) {
 
                                $r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 4, $is_default_profile);
 
-                               if($r === false)
+                               if ($r === false) {
                                        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, $is_default_profile);
 
-                               if($r === false)
+                               if ($r === false) {
                                        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, $is_default_profile);
 
-                               if($r === false)
+                               if ($r === false) {
                                        notice( sprintf(t('Image size reduction [%s] failed.'),"48") . EOL );
+                               }
 
                                // If setting for the default profile, unset the profile photo flag from any other photos I own
 
@@ -124,14 +125,15 @@ function profile_photo_post(&$a) {
                                info( t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
                                // Update global directory in background
                                $url = App::get_baseurl() . '/profile/' . $a->user['nickname'];
-                               if($url && strlen(get_config('system','directory')))
+                               if ($url && strlen(get_config('system','directory'))) {
                                        proc_run(PRIORITY_LOW, "include/directory.php", $url);
+                               }
 
                                require_once('include/profile_update.php');
                                profile_change();
-                       }
-                       else
+                       } else {
                                notice( t('Unable to process image') . EOL);
+                       }
                }
 
                goaway(App::get_baseurl() . '/profiles');
@@ -142,11 +144,13 @@ function profile_photo_post(&$a) {
        $filename = basename($_FILES['userfile']['name']);
        $filesize = intval($_FILES['userfile']['size']);
        $filetype = $_FILES['userfile']['type'];
-    if ($filetype=="") $filetype=guess_image_type($filename);
-    
+       if ($filetype == "") {
+               $filetype = guess_image_type($filename);
+       }
+
        $maximagesize = get_config('system','maximagesize');
 
-       if(($maximagesize) && ($filesize > $maximagesize)) {
+       if (($maximagesize) && ($filesize > $maximagesize)) {
                notice( sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL);
                @unlink($src);
                return;
@@ -155,7 +159,7 @@ function profile_photo_post(&$a) {
        $imagedata = @file_get_contents($src);
        $ph = new Photo($imagedata, $filetype);
 
-       if(! $ph->is_valid()) {
+       if (! $ph->is_valid()) {
                notice( t('Unable to process image.') . EOL );
                @unlink($src);
                return;
@@ -164,18 +168,17 @@ function profile_photo_post(&$a) {
        $ph->orient($src);
        @unlink($src);
        return profile_photo_crop_ui_head($a, $ph);
-       
 }
 
 
 if(! function_exists('profile_photo_content')) {
-function profile_photo_content(&$a) {
+function profile_photo_content(App $a) {
 
-       if(! local_user()) {
+       if (! local_user()) {
                notice( t('Permission denied.') . EOL );
                return;
        }
-       
+
        $newuser = false;
 
        if($a->argc == 2 && $a->argv[1] === 'new')
@@ -186,9 +189,9 @@ function profile_photo_content(&$a) {
                        notice( t('Permission denied.') . EOL );
                        return;
                };
-               
+
 //             check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
-        
+
                $resource_id = $a->argv[2];
                //die(":".local_user());
                $r=q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' ORDER BY `scale` ASC",
@@ -200,7 +203,7 @@ function profile_photo_content(&$a) {
                        return;
                }
                $havescale = false;
-               foreach($r as $rr) {
+               foreach ($r as $rr) {
                        if($rr['scale'] == 5)
                                $havescale = true;
                }
@@ -223,8 +226,9 @@ function profile_photo_content(&$a) {
 
                        // Update global directory in background
                        $url = $_SESSION['my_url'];
-                       if($url && strlen(get_config('system','directory')))
+                       if ($url && strlen(get_config('system','directory'))) {
                                proc_run(PRIORITY_LOW, "include/directory.php", $url);
+                       }
 
                        goaway(App::get_baseurl() . '/profiles');
                        return; // NOTREACHED
@@ -240,7 +244,7 @@ function profile_photo_content(&$a) {
 
 
        if(! x($a->config,'imagecrop')) {
-       
+
                $tpl = get_markup_template('profile_photo.tpl');
 
                $o .= replace_macros($tpl,array(
@@ -278,42 +282,46 @@ function profile_photo_content(&$a) {
 
 
 if(! function_exists('profile_photo_crop_ui_head')) {
-function profile_photo_crop_ui_head(&$a, $ph){
+function profile_photo_crop_ui_head(App $a, $ph) {
        $max_length = get_config('system','max_image_length');
-       if(! $max_length)
+       if (! $max_length) {
                $max_length = MAX_IMAGE_LENGTH;
-       if($max_length > 0)
+       }
+       if ($max_length > 0) {
                $ph->scaleImage($max_length);
+       }
 
        $width = $ph->getWidth();
        $height = $ph->getHeight();
 
-       if($width < 175 || $height < 175) {
+       if ($width < 175 || $height < 175) {
                $ph->scaleImageUp(200);
                $width = $ph->getWidth();
                $height = $ph->getHeight();
        }
 
        $hash = photo_new_resource();
-       
+
 
        $smallest = 0;
 
-       $r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 0 );   
+       $r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 0 );
 
-       if($r)
+       if ($r) {
                info( t('Image uploaded successfully.') . EOL );
-       else
+       } else {
                notice( t('Image upload failed.') . EOL );
+       }
 
-       if($width > 640 || $height > 640) {
+       if ($width > 640 || $height > 640) {
                $ph->scaleImage(640);
-               $r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 1 );   
-               
-               if($r === false)
+               $r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 1 );
+
+               if ($r === false) {
                        notice( sprintf(t('Image size reduction [%s] failed.'),"640") . EOL );
-               else
+               } else {
                        $smallest = 1;
+               }
        }
 
        $a->config['imagecrop'] = $hash;