Change the parameters for the organize dialog box. The baseUrl parame…

…ter was removed and replaced with the restUri, which contains the relative uri for the rest controller. The controller parameter is now the relative uri for the organize controller. The protocol parameter was added. In addition, there is not default size for the organize flex object. It attempts to fit within the gallery3 dialog box.

modules/organize/controllers/organize.php

@@ -45,6 +45,8 @@ function dialog($album_id) {
 
     $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;
   }
 

modules/organize/views/organize_dialog.html.php

@@ -87,14 +87,17 @@ function getTextStrings() {
 
   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") ?>/"
     };
   };
   /*