Андрей (andy) wrote in changelog,
Андрей
andy
changelog

[livejournal] r20916: LJSUP-10815 (Fotki.ru: store data on our...

Committer: ailyin
LJSUP-10815 (Fotki.ru: store data on our own servers)
U   trunk/bin/upgrading/en.dat
U   trunk/cgi-bin/LJ/Widget/EntryForm.pm
U   trunk/cgi-bin/weblib.pl
Modified: trunk/bin/upgrading/en.dat
===================================================================
--- trunk/bin/upgrading/en.dat	2012-01-17 08:46:55 UTC (rev 20915)
+++ trunk/bin/upgrading/en.dat	2012-01-17 13:03:48 UTC (rev 20916)
@@ -3181,6 +3181,8 @@
 fotki.photo.upload.error.no_access_to_storage_media|staleness=1
 fotki.photo.upload.error.no_access_to_storage_media=No access to storage media
 
+fotki.photo.upload.error.not_enough_space=Insufficient disk space
+
 fotki.photo.upload.photo_desc|staleness=1
 fotki.photo.upload.photo_desc=Photo description
 

Modified: trunk/cgi-bin/LJ/Widget/EntryForm.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/EntryForm.pm	2012-01-17 08:46:55 UTC (rev 20915)
+++ trunk/cgi-bin/LJ/Widget/EntryForm.pm	2012-01-17 13:03:48 UTC (rev 20916)
@@ -1594,7 +1594,7 @@
         'size'       => $_,
         'text'       => LJ::Lang::ml("fotki.size.$_.text"),
         'is_default' => ( $_ == $LJ::Pics::Photo::DEFAULT_SIZE ) ? 1 : 0,
-    } } @LJ::Pics::Photo::SUPPORTED_SIZES;
+    } } @LJ::Pics::Photo::DISPLAYED_SIZES;
 
     my $photo_sizes_json = LJ::JSON->to_json ( \@photo_sizes );
     my $album_list = [];
@@ -1614,7 +1614,9 @@
     my $available_space = LJ::Widget::Fotki::UserSpace->display_space(
         LJ::Pics->get_free_space($remote) );
 
-    my $auth_token = LJ::Auth->sessionless_auth_token ($LJ::DOMAIN_WEB."/pics/upload", user => $remote ? $remote->user : undef);
+    my $auth_token =
+        LJ::Auth->sessionless_auth_token( '/' . $remote->username );
+
     my $user_groups = LJ::JSON->to_json (LJ::Widget::Fotki::Photo->get_user_groups ($remote));
     my $ljphoto_enabled = $remote->can_upload_photo();
 

Modified: trunk/cgi-bin/weblib.pl
===================================================================
--- trunk/cgi-bin/weblib.pl	2012-01-17 08:46:55 UTC (rev 20915)
+++ trunk/cgi-bin/weblib.pl	2012-01-17 13:03:48 UTC (rev 20916)
@@ -1396,6 +1396,7 @@
                 imgprefix                => "$imgprefix",
                 siteroot                 => "$siteroot",
                 statprefix               => "$statprefix",
+                picsUploadDomain         => $LJ::PICS_UPLOAD_DOMAIN,
                 currentJournalBase       => "$journal_base",
                 currentJournal           => "$journal",
                 currentEntry             => $ljentry,

Tags: ailyin, andy, dat, livejournal, pl, pm
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments