still not quite ready for the big photos rollover

diff --git a/mod/photos.php b/mod/photos.php
index ecf5031b3d2a9d1ba40bce900819fc42c60edbd3..e811ca395714ae0ee4915ed07b404b6b489c08b1 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1,4 +1,5 @@
 <?php
+
 require_once('include/Photo.php');
 require_once('include/items.php');
 require_once('include/acl_selectors.php');
@@ -48,17 +49,8 @@ function photos_init(&$a) {
 
 
 
-function photos_post(&$a) {
-
-logger('mod/photos.php: photos_post(): begin' , 'LOGGER_DEBUG');
-
-foreach($_REQUEST AS $key => $val) {
-       logger('mod/photos.php: photos_post(): $_REQUEST key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG');
-}
 
-foreach($_FILES AS $key => $val) {
-       logger('mod/photos.php: photos_post(): $_FILES key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG');
-}
+function photos_post(&$a) {
 
        $can_post  = false;
        $visitor   = 0;
@@ -474,20 +466,18 @@ foreach($_FILES AS $key => $val) {
        }
 
 
-       /**
-        * default post action - upload a photo
-        */
-
-       call_hooks('photo_post_init', $_POST);
+       // default post action - upload a photo
 
-       /**
-        * Determine the album to use
-        */
+       if(! x($_FILES,'userfile'))
+               killme();
 
-       $album    = notags(trim($_REQUEST['album']));
-       $newalbum = notags(trim($_REQUEST['newalbum']));
+       if($_POST['partitionCount'])
+               $java_upload = true;
+       else
+               $java_upload = false;
 
-       logger('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , 'LOGGER_DEBUG');
+       $album =  notags(trim($_POST['album']));
+       $newalbum = notags(trim($_POST['newalbum']));
 
        if(! strlen($album)) {
                if(strlen($newalbum))
@@ -496,16 +486,6 @@ foreach($_FILES AS $key => $val) {
                        $album = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
        }
 
-       /**
-        *
-        * We create a wall item for every photo, but we don't want to
-        * overwhelm the data stream with a hundred newly uploaded photos.
-        * So we will make one photo (the first one uploaded to this album)
-        * visible by default, the rest will become visible over time when and if
-        * they acquire comments, likes, dislikes, and/or tags 
-        *
-        */
-
        $r = q("SELECT * FROM `photo` WHERE `album` = '%s' AND `uid` = %d",
                dbesc($album),
                intval($page_owner_uid)
@@ -515,25 +495,15 @@ foreach($_FILES AS $key => $val) {
        else
                $visible = 0;
 
-       $str_group_allow   = perms2str(((is_array($_REQUEST['group_allow']))   ? $_REQUEST['group_allow']   : explode(',',$_REQUEST['group_allow'])));
-       $str_contact_allow = perms2str(((is_array($_REQUEST['contact_allow'])) ? $_REQUEST['contact_allow'] : explode(',',$_REQUEST['contact_allow'])));
-       $str_group_deny    = perms2str(((is_array($_REQUEST['group_deny']))    ? $_REQUEST['group_deny']    : explode(',',$_REQUEST['group_deny'])));
-       $str_contact_deny  = perms2str(((is_array($_REQUEST['contact_deny']))  ? $_REQUEST['contact_deny']  : explode(',',$_REQUEST['contact_deny'])));
 
-       $ret = array('src' => '', 'filename' => '', 'filesize' => 0);
+       $str_group_allow   = perms2str($_POST['group_allow']);
+       $str_contact_allow = perms2str($_POST['contact_allow']);
+       $str_group_deny    = perms2str($_POST['group_deny']);
+       $str_contact_deny  = perms2str($_POST['contact_deny']);
 
-       call_hooks('photo_post_file',$ret);
-logger('after post_file');     
-       if(x($ret,'src') && x($ret,'filesize')) {
-               $src      = $ret['src'];
-               $filename = $ret['filename'];
-               $filesize = $ret['filesize'];
-       }
-       else {
-               $src        = $_FILES['userfile']['tmp_name'];
-               $filename   = basename($_FILES['userfile']['name']);
-               $filesize   = intval($_FILES['userfile']['size']);
-       }
+       $src               = $_FILES['userfile']['tmp_name'];
+       $filename          = basename($_FILES['userfile']['name']);
+       $filesize          = intval($_FILES['userfile']['size']);
 
        $maximagesize = get_config('system','maximagesize');
 
@@ -543,13 +513,10 @@ logger('after post_file');
                return;
        }
 
-       logger('mod/photos.php: photos_post(): loading the contents of ' . $src , 'LOGGER_DEBUG');
-
        $imagedata = @file_get_contents($src);
        $ph = new Photo($imagedata);
 
        if(! $ph->is_valid()) {
-               logger('mod/photos.php: photos_post(): unable to process image' , 'LOGGER_DEBUG');
                notice( t('Unable to process image.') . EOL );
                @unlink($src);
                killme();
@@ -557,7 +524,7 @@ logger('after post_file');
 
        @unlink($src);
 
-       $width  = $ph->getWidth();
+       $width = $ph->getWidth();
        $height = $ph->getHeight();
 
        $smallest = 0;
@@ -567,7 +534,6 @@ logger('after post_file');
        $r = $ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
 
        if(! $r) {
-               logger('mod/photos.php: photos_post(): image store failed' , 'LOGGER_DEBUG');
                notice( t('Image upload failed.') . EOL );
                killme();
        }
@@ -589,6 +555,7 @@ logger('after post_file');
 
        // Create item container
 
+
        $arr = array();
 
        $arr['uid']           = $page_owner_uid;
@@ -617,13 +584,14 @@ logger('after post_file');
 
        $item_id = item_store($arr);
 
-       call_hooks('photo_post_end',intval($item_id));
+       if(! $java_upload) {
+               goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+               return; // NOTREACHED
+       }
 
-       // addon uploaders should call "killme()" [e.g. exit] within the photo_post_end hook
-       // if they do not wish to be redirected
+       killme();
+       return; // NOTREACHED
 
-       goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
-       // NOTREACHED
 }
 
 
@@ -769,22 +737,6 @@ function photos_content(&$a) {
                $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 
                $albumselect .= '</select>';
-
-               $uploader = '';
-
-               $ret = array('post_url' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'],
-                               'addon_text' => $uploader,
-                               'default_upload' => true);
-
-
-               call_hooks('photo_upload_form',$ret);
-
-               $default_upload = '<input type="file" name="userfile" />        <div class="photos-upload-submit-wrapper" >
-               <input type="submit" name="submit" value="' . t('Submit') . '" id="photos-upload-submit" /> </div>';
-
-
- 
-
                $tpl = load_view_file('view/photos_upload.tpl');
                $o .= replace_macros($tpl,array(
                        '$pagename' => t('Upload Photos'),
@@ -792,16 +744,14 @@ function photos_content(&$a) {
                        '$nickname' => $a->data['user']['nickname'],
                        '$newalbum' => t('New album name: '),
                        '$existalbumtext' => t('or existing album name: '),
+                       '$filestext' => t('Select files to upload: '),
                        '$albumselect' => $albumselect,
                        '$permissions' => t('Permissions'),
                        '$aclselect' => (($visitor) ? '' : populate_acl($a->user, $celeb)),
-                       '$uploader' => $ret['addon_text'],
-                       '$filestext' => t('Select files to upload: '),
                        '$archive' => $a->get_baseurl() . '/jumploader_z.jar',
                        '$nojava' => t('Use the following controls only if the Java uploader [above] fails to launch.'),
-                       '$default' => (($ret['default_upload']) ? $default_upload : ''),
-                       '$uploadurl' => $ret['post_url']
-
+                       '$uploadurl' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'],
+                       '$submit' => t('Submit')
                ));
 
                return $o; 
@@ -1204,4 +1154,3 @@ function photos_content(&$a) {
        $o .= paginate($a);
        return $o;
 }
-

diff --git a/view/photos_upload.tpl b/view/photos_upload.tpl
index 490d4f2208fd9f0075dce1054df7583ea86ddedb..8a9dc3c683dc931c4ae1c4d63164d2cb531234c2 100644 (file)
--- a/view/photos_upload.tpl
+++ b/view/photos_upload.tpl
@@ -23,12 +23,41 @@
 
        </div>
 
-       <div id="photos_upload_spacer"></div>
+       <div id="photos-upload-select-files-text">$filestext</div>
+
+       <div id="photos_upload_applet_wrapper">
+               <applet name="jumpLoaderApplet"
+                       code="jmaster.jumploader.app.JumpLoaderApplet.class"
+                       archive="$archive"
+                       width="700"
+                       height="600"
+                       mayscript >
+                       <param name="uc_uploadUrl" value="$uploadurl" />
+                       <param name="uc_uploadFormName" value="photos-upload-form" />
+                       <param name="gc_loggingLeveL" value="FATAL" />
+                       <param name="uc_fileParameterName" value="userfile" />
+                       <param name="uc_cookie" value="PHPSESSID=$sessid; path=/;" />
+                       <param name="vc_disableLocalFileSystem" value="false" />
+                       <param name="vc_uploadViewMenuBarVisible" value="false" />
+                       <param name="vc_mainViewFileListViewVisible" value="true" />
+                       <param name="vc_mainViewFileListViewHeightPercent" value="50" />
+                       <param name="vc_mainViewFileTreeViewVisible" value="true" />
+                       <param name="vc_mainViewFileTreeViewWidthPercent" value="35" />
+                       <param name="vc_lookAndFeel" value="system" />
+       
+               </applet>
+               
+       </div>
 
-       $uploader
+       <div id="photos-upload-no-java-message" >
+       $nojava
+       </div>  
 
-       $default
+       <input type="file" name="userfile" />
 
+       <div class="photos-upload-submit-wrapper" >
+               <input type="submit" name="submit" value="$submit" id="photos-upload-submit" />
+       </div>
        <div class="photos-upload-end" ></div>
 </form>