From b46b9b1464249916d105ee46f0bdb7972863070d Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Thu, 10 Nov 2011 07:00:44 -0500 Subject: moved upload forms to new location --- pages/flickr/importPhotosets.php | 50 --------- pages/flickr/setup.php | 17 ---- pages/upload.php | 13 ++- views/default/forms/tidypics/ajax_upload.php | 141 ++++++++++++++++++++++++++ views/default/forms/tidypics/basic_upload.php | 104 +++++++++++++++++++ views/default/tidypics/forms/ajax_upload.php | 137 ------------------------- views/default/tidypics/forms/setupFlickr.php | 45 -------- views/default/tidypics/forms/upload.php | 103 ------------------- 8 files changed, 256 insertions(+), 354 deletions(-) delete mode 100644 pages/flickr/importPhotosets.php delete mode 100644 pages/flickr/setup.php create mode 100644 views/default/forms/tidypics/ajax_upload.php create mode 100644 views/default/forms/tidypics/basic_upload.php delete mode 100644 views/default/tidypics/forms/ajax_upload.php delete mode 100644 views/default/tidypics/forms/setupFlickr.php delete mode 100644 views/default/tidypics/forms/upload.php diff --git a/pages/flickr/importPhotosets.php b/pages/flickr/importPhotosets.php deleted file mode 100644 index a807a0782..000000000 --- a/pages/flickr/importPhotosets.php +++ /dev/null @@ -1,50 +0,0 @@ -" . elgg_echo( 'flickr:desc' ) . ""; - - $viewer = get_loggedin_user(); - - require_once dirname(dirname(dirname(__FILE__))) . "/lib/phpFlickr/phpFlickr.php"; - require_once( dirname(dirname(dirname(__FILE__)))) . "/lib/flickr.php"; - $f = new phpFlickr("26b2abba37182aca62fe0eb2c7782050"); - - $viewer = get_loggedin_user(); - $flickr_username = get_metadata_byname( $viewer->guid, "flickr_username" ); - $flickr_id = get_metadata_byname( $viewer->guid, "flickr_id" ); - $album_id = get_metadata_byname( $viewer->guid, "flickr_album_id" ); - - if( intval( $album_id->value ) <= 0 ) { - register_error( sprintf( elgg_echo( 'flickr:errornoalbum' ), $album_id->value )); - forward( "/mod/tidypics/pages/flickr/setup.php" ); - } - - $photosets = $f->photosets_getList( $flickr_id->value ); - foreach( $photosets["photoset"] as $photoset ) { - $body .= "
"; - $body .= "$photoset[title]
"; - - $count = 0; - $looper = 0; - //create links to import photos 10 at a time - while( $photoset["photos"] > $count ) { - $looper++; - $body .= " $looper"; - $count = $count + 10; - } - $body .= "
$photoset[photos] images"; - $body .= "
"; -// echo "
"; var_dump( $photoset ); echo "
"; die; - } - -// $body .= elgg_view("tidypics/forms/setupFlickr", array(), false, true ); - flickr_menu(); - page_draw( elgg_echo( 'flickr:importmanager' ), elgg_view_layout("two_column_left_sidebar", '', $body)); - -?> \ No newline at end of file diff --git a/pages/flickr/setup.php b/pages/flickr/setup.php deleted file mode 100644 index 1de8c29c2..000000000 --- a/pages/flickr/setup.php +++ /dev/null @@ -1,17 +0,0 @@ -"; var_dump($body); echo ""; - page_draw( elgg_echo( 'flickr:setup'), elgg_view_layout("two_column_left_sidebar", '', $body)); -?> \ No newline at end of file diff --git a/pages/upload.php b/pages/upload.php index 7ac4930b5..6580c6f52 100644 --- a/pages/upload.php +++ b/pages/upload.php @@ -6,6 +6,8 @@ include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"; +global $CONFIG; + // must be logged in to upload images gatekeeper(); @@ -43,9 +45,16 @@ $title = elgg_echo('album:addpix') . ': ' . $album->title; $area2 .= elgg_view_title($title); if ($uploader == 'basic') { - $area2 .= elgg_view("tidypics/forms/upload", array('album' => $album)); + $area2 .= elgg_view('input/form', array( + 'action' => "{$CONFIG->wwwroot}action/tidypics/upload", + 'body' => elgg_view('forms/tidypics/basic_upload', array('album' => $album)), + 'internalid' => 'tidypicsUpload', + 'enctype' => 'multipart/form-data', + 'method' => 'post', + )); + } else { - $area2 .= elgg_view("tidypics/forms/ajax_upload", array('album' => $album)); + $area2 .= elgg_view("forms/tidypics/ajax_upload", array('album' => $album)); } $body = elgg_view_layout('two_column_left_sidebar', '', $area2); diff --git a/views/default/forms/tidypics/ajax_upload.php b/views/default/forms/tidypics/ajax_upload.php new file mode 100644 index 000000000..a1d13e80b --- /dev/null +++ b/views/default/forms/tidypics/ajax_upload.php @@ -0,0 +1,141 @@ +salt); + +$basic_uploader_url = current_page_url() . '/basic'; +$upload_endpoint_url = "{$vars['url']}action/tidypics/ajax_upload/"; +$upload_complete_url = "{$vars['url']}action/tidypics/ajax_upload_complete/"; + +$maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics'); +if (!$maxfilesize) { + $maxfilesize = 5; +} + +$quota = get_plugin_setting('quota','tidypics'); +if ($quota) { + $image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size"); + $image_repo_size = (int)$image_repo_size_md->value; + $image_repo_size = $image_repo_size / 1024 / 1024; + $quote_percentage = round(100 * ($image_repo_size / $quota)); + // for small quotas, so one decimal place + if ($quota < 10) { + $image_repo_size = sprintf('%.1f', $image_repo_size); + } else { + $image_repo_size = round($image_repo_size); + } + if ($image_repo_size > $quota) { + $image_repo_size = $quota; + } +} + +?> + +
+ +

+ + +
+ + diff --git a/views/default/forms/tidypics/basic_upload.php b/views/default/forms/tidypics/basic_upload.php new file mode 100644 index 000000000..55ab854a4 --- /dev/null +++ b/views/default/forms/tidypics/basic_upload.php @@ -0,0 +1,104 @@ +access_id; + +$maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics'); +if (!$maxfilesize) { + $maxfilesize = 5; +} + +$quota = get_plugin_setting('quota','tidypics'); +if ($quota) { + $image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size"); + $image_repo_size = (int)$image_repo_size_md->value; + $image_repo_size = $image_repo_size / 1024 / 1024; + $quote_percentage = round(100 * ($image_repo_size / $quota)); + // for small quotas, so one decimal place + if ($quota < 10) { + $image_repo_size = sprintf('%.1f', $image_repo_size); + } else { + $image_repo_size = round($image_repo_size); + } + if ($image_repo_size > $quota) { + $image_repo_size = $quota; + } +} + +?> +
+
+ +

+
+
+ +
+ +

+
+
...
+
+
    + ' . elgg_view("input/file",array('internalname' => "upload_$x")) . ''; + } + ?> +
+

+

+ guid . '" />'; + } + if ($access_id) { + echo ''; + } + ?> + " onclick="displayProgress();" /> +

+ +
+ \ No newline at end of file diff --git a/views/default/tidypics/forms/ajax_upload.php b/views/default/tidypics/forms/ajax_upload.php deleted file mode 100644 index 4a7a05c0c..000000000 --- a/views/default/tidypics/forms/ajax_upload.php +++ /dev/null @@ -1,137 +0,0 @@ -salt); - -$basic_uploader_url = current_page_url() . '/basic'; -$upload_endpoint_url = "{$vars['url']}action/tidypics/ajax_upload/"; -$upload_complete_url = "{$vars['url']}action/tidypics/ajax_upload_complete/"; - -$maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics'); -if (!$maxfilesize) { - $maxfilesize = 5; -} - -$quota = get_plugin_setting('quota','tidypics'); -if ($quota) { - $image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size"); - $image_repo_size = (int)$image_repo_size_md->value; - $image_repo_size = $image_repo_size / 1024 / 1024; - $quote_percentage = round(100 * ($image_repo_size / $quota)); - // for small quotas, so one decimal place - if ($quota < 10) { - $image_repo_size = sprintf('%.1f', $image_repo_size); - } else { - $image_repo_size = round($image_repo_size); - } - if ($image_repo_size > $quota) { - $image_repo_size = $quota; - } -} - -?> - -
- -

- - -
- - - diff --git a/views/default/tidypics/forms/setupFlickr.php b/views/default/tidypics/forms/setupFlickr.php deleted file mode 100644 index 6c461176d..000000000 --- a/views/default/tidypics/forms/setupFlickr.php +++ /dev/null @@ -1,45 +0,0 @@ -guid, "flickr_username" ); -$flickr_album_id = get_metadata_byname( $user->guid, "flickr_album_id" ); - -$action = $vars['url'] . 'admin/action/tidypics/flickrSetup'; - -$form_body = "

". elgg_echo( 'flickr:intro' ) . "

"; -$form_body .= elgg_echo( 'flickr:usernamesetup') . "
"; -$form_body .= ""; - -$albums = elgg_get_entities(array( - "type=" => "object", - "subtype" => "album", - "owner_guid" => $user->guid, -)); -$options = array( 0 => elgg_echo( 'flickr:selectalbum' )); -foreach( $albums as $album ) { - $title = $album->title; - switch( $album->access_id ) { - case ACCESS_PRIVATE: - $title .= " (" . elgg_echo( 'private' ) . ")"; - break; - case ACCESS_PUBLIC: - $title .= " (" . elgg_echo( 'public' ) . ")"; - break; - default: - $title .= " (no known permission set)"; - break; - } - $options[$album->guid] = $title; -} - -$form_body .= "
" . elgg_echo( 'flickr:albumdesc' ); -$form_body .= elgg_view('input/pulldown', array('internalname' => 'album_id', - 'options_values' => $options, - 'value' => $flickr_album_id->value )); -$form_body .= "
"; -$form_body .= elgg_view('input/submit', array('value' => elgg_echo("save"))); - -flickr_menu(); - -echo elgg_view('input/form', array('action' => $action, 'body' => $form_body)); diff --git a/views/default/tidypics/forms/upload.php b/views/default/tidypics/forms/upload.php deleted file mode 100644 index 8bbda08b3..000000000 --- a/views/default/tidypics/forms/upload.php +++ /dev/null @@ -1,103 +0,0 @@ -access_id; - -$maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics'); -if (!$maxfilesize) { - $maxfilesize = 5; -} - -$quota = get_plugin_setting('quota','tidypics'); -if ($quota) { - $image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size"); - $image_repo_size = (int)$image_repo_size_md->value; - $image_repo_size = $image_repo_size / 1024 / 1024; - $quote_percentage = round(100 * ($image_repo_size / $quota)); - // for small quotas, so one decimal place - if ($quota < 10) { - $image_repo_size = sprintf('%.1f', $image_repo_size); - } else { - $image_repo_size = round($image_repo_size); - } - if ($image_repo_size > $quota) { - $image_repo_size = $quota; - } -} - -?> -

-
- -

-
-
- -
- -

-
-
...
-
-
    - ' . elgg_view("input/file",array('internalname' => "upload_$x")) . ''; - } - ?> -
-

-

- guid . '" />'; - } - if ($access_id) { - echo ''; - } - ?> - " onclick="displayProgress();" /> -

- "{$vars['url']}action/tidypics/upload", - 'body' => $form_body, - 'internalid' => 'tidypicsUpload', - 'enctype' => 'multipart/form-data', - 'method' => 'post',) -); -?> -
- \ No newline at end of file -- cgit v1.2.3