Changeset 28919
- Timestamp:
- Jul 2, 2014, 3:34:46 PM (10 years ago)
- Location:
- trunk/admin
- Files:
-
- 2 deleted
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/include/photos_add_direct_prepare.inc.php
r28533 r28919 22 22 // +-----------------------------------------------------------------------+ 23 23 24 25 // +-----------------------------------------------------------------------+26 // | Uploaded photos |27 // +-----------------------------------------------------------------------+28 29 if (isset($page['thumbnails']))30 {31 $template->assign(32 array(33 'thumbnails' => $page['thumbnails'],34 )35 );36 37 // only display the batch link if we have more than 1 photo38 if (count($page['thumbnails']) > 1)39 {40 $template->assign(41 array(42 'batch_link' => $page['batch_link'],43 'batch_label' => sprintf(44 l10n('Manage this set of %d photos'),45 count($page['thumbnails'])46 ),47 )48 );49 }50 }51 52 24 // +-----------------------------------------------------------------------+ 53 25 // | Photo selection | 54 26 // +-----------------------------------------------------------------------+ 55 56 $uploadify_path = PHPWG_ROOT_PATH.'admin/include/uploadify';57 27 58 28 $upload_max_filesize = min( … … 73 43 array( 74 44 'F_ADD_ACTION'=> PHOTOS_ADD_BASE_URL, 75 'uploadify_path' => $uploadify_path,76 45 'upload_max_filesize' => $upload_max_filesize, 77 46 'upload_max_filesize_shorthand' => $upload_max_filesize_shorthand, … … 118 87 119 88 120 $upload_modes = array('html', 'multiple'); 121 $upload_mode = isset($conf['upload_mode']) ? $conf['upload_mode'] : 'multiple'; 122 123 if (isset($_GET['upload_mode']) and $upload_mode != $_GET['upload_mode'] and in_array($_GET['upload_mode'], $upload_modes)) 124 { 125 $upload_mode = $_GET['upload_mode']; 126 conf_update_param('upload_mode', $upload_mode); 127 } 128 129 // what is the upload switch mode 130 $index_of_upload_mode = array_flip($upload_modes); 131 $upload_mode_index = $index_of_upload_mode[$upload_mode]; 132 $upload_switch = $upload_modes[ ($upload_mode_index + 1) % 2 ]; 133 134 $template->assign( 135 array( 136 'upload_mode' => $upload_mode, 137 'form_action' => PHOTOS_ADD_BASE_URL.'&upload_mode='.$upload_mode.'&processed=1', 138 'switch_url' => PHOTOS_ADD_BASE_URL.'&upload_mode='.$upload_switch, 139 'upload_id' => md5(rand()), 140 'session_id' => session_id(), 89 $template->assign( 90 array( 91 'form_action' => PHOTOS_ADD_BASE_URL, 141 92 'pwg_token' => get_pwg_token(), 142 'another_upload_link' => PHOTOS_ADD_BASE_URL.'&upload_mode='.$upload_mode,143 93 ) 144 94 ); … … 152 102 } 153 103 154 if ( 'html' == $upload_mode)104 if (false) // TODO manage zip files in pwg.images.upload 155 105 { 156 106 $upload_file_types.= ', zip'; … … 279 229 array( 280 230 'setup_warnings' => $setup_warnings, 281 'hide_warnings_link' => PHOTOS_ADD_BASE_URL.'& upload_mode='.$upload_mode.'&hide_warnings=1'231 'hide_warnings_link' => PHOTOS_ADD_BASE_URL.'&hide_warnings=1' 282 232 ) 283 233 ); -
trunk/admin/photos_add_direct.php
r26461 r28919 59 59 60 60 // +-----------------------------------------------------------------------+ 61 // | process form |62 // +-----------------------------------------------------------------------+63 64 include_once(PHPWG_ROOT_PATH.'admin/include/photos_add_direct_process.inc.php');65 66 // +-----------------------------------------------------------------------+67 61 // | prepare form | 68 62 // +-----------------------------------------------------------------------+
Note: See TracChangeset
for help on using the changeset viewer.