add default album names to photos

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 0298e76a52612f5e3ce5144ddbbadf9587eb6861..e5a550cd9511c26969bcf60d2a75523c5c4ba7a7 100644 (file)
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -91,15 +91,15 @@ function dfrn_confirm_post(&$a) {
                                        
                                        $hash = hash('md5',uniqid(mt_rand(),true));
 
-                                       $r = q("INSERT INTO `photo` ( `uid`, `contact-id`, `resource-id`, `created`, `edited`, `filename`,
-                                               `height`, `width`, `data`, `scale` )
-                                               VALUES ( %d, %d, '%s', '%s', '%s', '%s', %d, %d, '%s', 4 )",
+                                       $r = q("INSERT INTO `photo` ( `uid`, `contact-id`, `resource-id`, `created`, `edited`, `filename`, `album`, `height`, `width`, `data`, `scale` )
+                                               VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', 4 )",
                                                intval($local_uid),
                                                intval($dfrn_record),
                                                dbesc($hash),
                                                datetime_convert(),
                                                datetime_convert(),
                                                dbesc(basename($r[0]['photo'])),
+                                               dbesc( t('Contact Photos') ),
                                                intval($img->getHeight()),
                                                intval($img->getWidth()),
                                                dbesc($img->imageString())
@@ -108,25 +108,24 @@ function dfrn_confirm_post(&$a) {
                                                $photo_failure = true;
                                        
                                        $img->scaleImage(80);
-                                       $r =  q("INSERT INTO `photo` ( `uid`, `contact-id`, `resource-id`, `created`, `edited`, `filename`,
-                                                `height`, `width`, `data`, `scale` )
-                                                VALUES ( %d, %d, '%s', '%s', '%s', '%s', %d, %d, '%s', 5 )",
-                                                intval($local_uid),
+                                       $r =  q("INSERT INTO `photo` ( `uid`, `contact-id`, `resource-id`, `created`, `edited`, `filename`, `album`, `height`, `width`, `data`, `scale` )
+                                               VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', 5 )",
+                                               intval($local_uid),
                                                intval($dfrn_record),
-                                                dbesc($hash),
-                                                datetime_convert(),
-                                                datetime_convert(),
-                                                dbesc(basename($r[0]['photo'])),
-                                                intval($img->getHeight()),
-                                                intval($img->getWidth()),
-                                                dbesc($img->imageString())
-                                        );
+                                               dbesc($hash),
+                                               datetime_convert(),
+                                               datetime_convert(),
+                                               dbesc(basename($r[0]['photo'])),
+                                               dbesc( t('Contact Photos')),
+                                               intval($img->getHeight()),
+                                               intval($img->getWidth()),
+                                               dbesc($img->imageString())
+                                       );
                                        if($r === false)
                                                $photo_failure = true;
 
                                        $photo = $a->get_baseurl() . '/photo/' . $hash . '-4.jpg';
-                                       $thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.jpg';
-                                       
+                                       $thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.jpg';      
                                }
                                else
                                        $photo_failure = true;
@@ -320,39 +319,38 @@ function dfrn_confirm_post(&$a) {
                                        
                                $hash = hash('md5',uniqid(mt_rand(),true));
 
-                               $r = q("INSERT INTO `photo` ( `uid`, `resource-id`, `created`, `edited`, `filename`,
-                                               `height`, `width`, `data`, `scale` )
-                                               VALUES ( %d, '%s', '%s', '%s', '%s', %d, %d, '%s', 4 )",
+                               $r = q("INSERT INTO `photo` ( `uid`, `resource-id`, `created`, `edited`, `filename`, `album`, `height`, `width`, `data`, `scale` )
+                                               VALUES ( %d, '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', 4 )",
                                        intval($local_uid),
-                                               dbesc($hash),
-                                               datetime_convert(),
-                                               datetime_convert(),
-                                               dbesc(basename($r[0]['photo'])),
-                                               intval($img->getHeight()),
+                                       dbesc($hash),
+                                       datetime_convert(),
+                                       datetime_convert(),
+                                       dbesc(basename($r[0]['photo'])),
+                                       dbesc( t('Contact Photos') ),
+                                       intval($img->getHeight()),
                                        intval($img->getWidth()),
                                        dbesc($img->imageString())
                                );
                                if($r === false)
                                        $photo_failure = true;
                                $img->scaleImage(80);
-                               $r =  q("INSERT INTO `photo` ( `uid`, `resource-id`, `created`, `edited`, `filename`,
-                                       `height`, `width`, `data`, `scale` )
-                                         VALUES ( %d, '%s', '%s', '%s', '%s', %d, %d, '%s', 5 )",
-                                         intval($local_uid),
-                                         dbesc($hash),
-                                         datetime_convert(),
-                                         datetime_convert(),
-                                         dbesc(basename($r[0]['photo'])),
-                                         intval($img->getHeight()),
-                                         intval($img->getWidth()),
-                                         dbesc($img->imageString())
-                                );
+                               $r =  q("INSERT INTO `photo` ( `uid`, `resource-id`, `created`, `edited`, `filename`, `album`, `height`, `width`, `data`, `scale` )
+                                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', 5 )",
+                                       intval($local_uid),
+                                       dbesc($hash),
+                                       datetime_convert(),
+                                       datetime_convert(),
+                                       dbesc(basename($r[0]['photo'])),
+                                       dbesc( t('Contact Photos') ),
+                                       intval($img->getHeight()),
+                                       intval($img->getWidth()),
+                                       dbesc($img->imageString())
+                               );
                                if($r === false)
                                        $photo_failure = true;
 
                                $photo = $a->get_baseurl() . '/photo/' . $hash . '-4.jpg';
                                $thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.jpg';
-                                       
                        }
                        else
                                $photo_failure = true;
@@ -371,7 +369,7 @@ function dfrn_confirm_post(&$a) {
                        intval($contact_id)
                );
                if($r === false)
-                       notice( t("Unable to set contact photo info.") . EOL);
+                       notice( t('Unable to set contact photo.') . EOL);
 
                goaway($a->get_baseurl() . '/contacts/' . intval($contact_id));
                return;  //NOTREACHED

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 9a694971dbebd5824d8b1cb4771cc695ff3f4102..818cbecb2e71ba9baac41dba27d1b11ff02ed363 100644 (file)
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -7,15 +7,17 @@ function profile_photo_init(&$a) {
        if(! local_user()) {
                return;
        }
+
        require_once("mod/profile.php");
        profile_load($a,$a->user['nickname']);
+
 }
 
 
 function profile_photo_post(&$a) {
 
         if(! local_user()) {
-                notice ( "Permission denied." . EOL );
+                notice ( t('Permission denied.') . EOL );
                 return;
         }
 
@@ -24,7 +26,7 @@ function profile_photo_post(&$a) {
                // phase 2 - we have finished cropping
 
                if($a->argc != 2) {
-                       notice( "Image uploaded but image cropping failed." . EOL );
+                       notice( t('Image uploaded but image cropping failed.') . EOL );
                        return;
                }
 
@@ -53,39 +55,41 @@ function profile_photo_post(&$a) {
                        $im = new Photo($base_image['data']);
                        $im->cropImage(175,$srcX,$srcY,$srcW,$srcH);
 
-                       $ret = q("INSERT INTO `photo` ( `uid`, `resource-id`, `created`, `edited`, `filename`, 
+                       $ret = q("INSERT INTO `photo` ( `uid`, `resource-id`, `created`, `edited`, `filename`, `album`, 
                                `height`, `width`, `data`, `scale`, `profile` )
-                               VALUES ( %d, '%s', '%s', '%s', '%s', %d, %d, '%s', 4, 1 )",
+                               VALUES ( %d, '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', 4, 1 )",
                                intval($_SESSION['uid']),
                                dbesc($base_image['resource-id']),
                                datetime_convert(),
                                datetime_convert(),
                                dbesc($base_image['filename']),
+                               dbesc( t('Profile Photos') ),
                                intval($im->getHeight()),
                                intval($im->getWidth()),
                                dbesc($im->imageString())
                        );
 
                        if($r === false)
-                               notice ("Image size reduction (175) failed." . EOL );
+                               notice ( t('Image size reduction (175) failed.') . EOL );
 
                        $im->scaleImage(80);
 
-                       $ret = q("INSERT INTO `photo` ( `uid`, `resource-id`, `created`, `edited`, `filename`, 
+                       $ret = q("INSERT INTO `photo` ( `uid`, `resource-id`, `created`, `edited`, `filename`, `album`,
                                `height`, `width`, `data`, `scale`, `profile` )
-                               VALUES ( %d, '%s', '%s', '%s', '%s', %d, %d, '%s', 5, 1 )",
+                               VALUES ( %d, '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', 5, 1 )",
                                intval($_SESSION['uid']),
                                dbesc($base_image['resource-id']),
                                datetime_convert(),
                                datetime_convert(),
                                dbesc($base_image['filename']),
+                               dbesc( t('Profile Photos') ),
                                intval($im->getHeight()),
                                intval($im->getWidth()),
                                dbesc($im->imageString())
                        );
                        
                        if($r === false)
-                               notice("Image size reduction (80) failed." . EOL);
+                               notice( t('Image size reduction (80) failed.') . EOL );
 
                        // Unset the profile photo flag from any other photos I own
 
@@ -107,7 +111,7 @@ function profile_photo_post(&$a) {
        $ph = new Photo($imagedata);
 
        if(! ($image = $ph->getImage())) {
-               notice("Unable to process image." . EOL);
+               notice( t('Unable to process image.') . EOL );
                @unlink($src);
                return;
        }
@@ -128,21 +132,22 @@ function profile_photo_post(&$a) {
        $str_image = $ph->imageString();
        $smallest = 0;
 
-       $r = q("INSERT INTO `photo` ( `uid`, `resource-id`, `created`, `edited`, `filename`, 
+       $r = q("INSERT INTO `photo` ( `uid`, `resource-id`, `created`, `edited`, `filename`, `album`, 
                `height`, `width`, `data`, `scale` )
-               VALUES ( %d, '%s', '%s', '%s', '%s', %d, %d, '%s', 0 )",
+               VALUES ( %d, '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', 0 )",
                intval($_SESSION['uid']),
                dbesc($hash),
                datetime_convert(),
                datetime_convert(),
                dbesc(basename($filename)),
+               dbesc( t('Profile Photos') ),
                intval($height),
                intval($width),
                dbesc($str_image));
        if($r)
-               notice("Image uploaded successfully." . EOL);
+               notice( t('Image uploaded successfully.') . EOL );
        else
-               notice("Image upload failed." . EOL);
+               notice( t('Image upload failed.') . EOL );
 
        if($width > 640 || $height > 640) {
                $ph->scaleImage(640);
@@ -150,20 +155,21 @@ function profile_photo_post(&$a) {
                $width = $ph->getWidth();
                $height = $ph->getHeight();
 
-               $r = q("INSERT INTO `photo` ( `uid`, `resource-id`, `created`, `edited`, `filename`, 
+               $r = q("INSERT INTO `photo` ( `uid`, `resource-id`, `created`, `edited`, `filename`, `album`,
                        `height`, `width`, `data`, `scale` )
-                       VALUES ( %d, '%s', '%s', '%s', '%s', %d, %d, '%s', 1 )",
+                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', 1 )",
                        intval($_SESSION['uid']),
                        dbesc($hash),
                        datetime_convert(),
                        datetime_convert(),
                        dbesc(basename($filename)),
+                       dbesc( t('Profile Photos') ),
                        intval($ph->getHeight()),
                        intval($ph->getWidth()),
                        dbesc($ph->imageString())
                );
                if($r === false)
-                       notice("Image size reduction (640) failed." . EOL );
+                       notice( t('Image size reduction (640) failed.') . EOL );
                else
                        $smallest = 1;
        }
@@ -179,7 +185,7 @@ if(! function_exists('profile_photo_content')) {
 function profile_photo_content(&$a) {
 
        if(! local_user()) {
-               notice("Permission denied." . EOL );
+               notice( t('Permission denied.') . EOL );
                return;
        }
 

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index bd7cf856031813fda557fbd2f0cb278a37d8eeb3..c585fc30b8c28865895b27904c1e1f6f2a3bac4f 100644 (file)
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -54,14 +54,15 @@ function wall_upload_post(&$a) {
        if($width > 640 || $height > 640) {
                $ph->scaleImage(640);
 
-               $r = q("INSERT INTO `photo` ( `uid`, `resource-id`, `created`, `edited`, `filename`, 
+               $r = q("INSERT INTO `photo` ( `uid`, `resource-id`, `created`, `edited`, `filename`, `album`,
                        `height`, `width`, `data`, `scale` )
-                       VALUES ( %d, '%s', '%s', '%s', '%s', %d, %d, '%s', 1 )",
+                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', 1 )",
                        intval($_SESSION['uid']),
                        dbesc($hash),
                        datetime_convert(),
                        datetime_convert(),
                        dbesc(basename($filename)),
+                       dbesc( t('Wall Photos') ),
                        intval($ph->getHeight()),
                        intval($ph->getWidth()),
                        dbesc($ph->imageString())
@@ -73,14 +74,15 @@ function wall_upload_post(&$a) {
        if($width > 320 || $height > 320) {
                $ph->scaleImage(320);
 
-               $r = q("INSERT INTO `photo` ( `uid`, `resource-id`, `created`, `edited`, `filename`, 
+               $r = q("INSERT INTO `photo` ( `uid`, `resource-id`, `created`, `edited`, `filename`, `album`,
                        `height`, `width`, `data`, `scale` )
-                       VALUES ( %d, '%s', '%s', '%s', '%s', %d, %d, '%s', 2 )",
+                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', 2 )",
                        intval($_SESSION['uid']),
                        dbesc($hash),
                        datetime_convert(),
                        datetime_convert(),
                        dbesc(basename($filename)),
+                       dbesc( t('Wall Photos') ),
                        intval($ph->getHeight()),
                        intval($ph->getWidth()),
                        dbesc($ph->imageString())