summaryrefslogtreecommitdiff
path: root/modules/organize/controllers
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2010-06-14 13:07:58 -0700
committerTim Almdal <tnalmdal@shaw.ca>2010-06-14 13:07:58 -0700
commitf10d641044fe31224af5b42b148a8ee77d9a34db (patch)
tree63ebf676cf3064499ba129870a0a54be9f9e08c0 /modules/organize/controllers
parent1c5264d7f5a2914f3ae0cb1208b2bc2810b090ec (diff)
Change the parameters for the organize dialog box. The baseUrl parameter 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.
Diffstat (limited to 'modules/organize/controllers')
-rw-r--r--modules/organize/controllers/organize.php2
1 files changed, 2 insertions, 0 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;
}