diff options
Diffstat (limited to 'modules/organize')
| -rw-r--r-- | modules/organize/controllers/organize.php | 2 | ||||
| -rw-r--r-- | modules/organize/lib/Gallery3WebClient.swf | bin | 142627 -> 147590 bytes | |||
| -rw-r--r-- | modules/organize/views/organize_dialog.html.php | 11 |
3 files changed, 9 insertions, 4 deletions
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php index 199aeaf3..d688a76d 100644 --- a/modules/organize/controllers/organize.php +++ b/modules/organize/controllers/organize.php @@ -45,6 +45,8 @@ class Organize_Controller extends Controller { $user = identity::active_user(); $v->access_key = rest::get_access_key($user->id)->access_key; + + $v->protocol = (empty($_SERVER["HTTPS"]) OR $_SERVER["HTTPS"] === "off") ? "http" : "https"; print $v; } diff --git a/modules/organize/lib/Gallery3WebClient.swf b/modules/organize/lib/Gallery3WebClient.swf Binary files differindex 879a4fec..c51fa4e8 100644 --- a/modules/organize/lib/Gallery3WebClient.swf +++ b/modules/organize/lib/Gallery3WebClient.swf diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php index 8c5ba133..8160a339 100644 --- a/modules/organize/views/organize_dialog.html.php +++ b/modules/organize/views/organize_dialog.html.php @@ -87,14 +87,17 @@ function getGalleryParameters() { return { - fileFilter: "<?= $file_filter ?>", + dialogWidth: $("#g-dialog:parent").width(), + dialogHeight: $("#g-dialog").height(), domain: "<?= $domain ?>", + accessKey: "<?= $access_key ?>", + protocol: "<?= $protocol ?>", + fileFilter: "<?= $file_filter ?>", sortOrder: "<?= $sort_order ?>", sortFields: "<?= $sort_fields ?>", - baseUrl: "<?= $base_url ?>", - accessKey: "<?= $access_key ?>", albumId: "<?= $album->id ?>", - controller: "<?= url::abs_site("organize") ?>/" + restUri: "<?= url::site("rest") ?>/", + controller: "<?= url::site("organize") ?>/" }; }; /* |