';
+
+ $out .= '
';
+
+ if ( $session->user_level < USER_LEVEL_ADMIN )
+ {
+ $out .= $title_safe;
+ }
+ else if ( $session->user_level >= USER_LEVEL_ADMIN )
+ {
+ $out .= '';
+ $out .= '';
+ }
+
+ $out .= '
';
+
+ $out .= '' . print_r(gallery_folder_hierarchy(), true) . ''); + + $sort_column = ( isset($_GET['sort']) && in_array($_GET['sort'], array('img_title', 'img_time_upload', 'img_time_mod')) ) ? $_GET['sort'] : 'img_title'; + $sort_order = ( isset($_GET['order']) && in_array($_GET['order'], array('ASC', 'DESC')) ) ? $_GET['order'] : 'ASC'; + + // Determine number of pictures per page + $template->load_theme(); + + global $theme; + $fn = ENANO_ROOT . '/themes/' . $template->theme . '/theme.cfg'; + require( $fn ); + if ( isset($theme['snapr_gallery_rows']) ) + { + $rows_in_browser = intval($theme['snapr_gallery_rows']); + if ( empty($rows_in_browser) ) + { + $rows_in_browser = 5; + } + } + else + { + $rows_in_browser = 5; + } + + $where = 'WHERE folder_parent IS NULL ' . "\n ORDER BY is_folder DESC, $sort_column $sort_order, img_title ASC"; + $parms = $paths->getAllParams(); + + $sql = "SELECT img_id, img_title, is_folder FROM ".table_prefix."gallery $where;"; + + // Breadcrumb browser + $breadcrumbs = array(); + $breadcrumbs[] = 'Gallery index'; + + $breadcrumb_urlcache = ''; + + // CSS for gallery browser + $template->add_header(''); + $template->add_header(''); + + $header = $template->getHeader(); + + if ( !empty($parms) ) + { + $parms = dirtify_page_id($parms); + if ( strstr($parms, '/') ) + { + $folders = explode('/', $parms); + } + else + { + $folders = array(0 => $parms); + } + foreach ( $folders as $i => $_crap ) + { + $folder =& $folders[$i]; + + $f_url = sanitize_page_id($folder); + $breadcrumb_urlcache .= '/' . $f_url; + $breadcrumb_url = makeUrlNS('Special', 'Gallery' . $breadcrumb_urlcache); + + $folder = str_replace('_', ' ', $folder); + + if ( $i == ( count($folders) - 1 ) ) + { + $breadcrumbs[] = htmlspecialchars($folder); + } + else + { + $breadcrumbs[] = '' . htmlspecialchars($folder) . ''; + } + } + unset($folder); + $folders = array_reverse($folders); + // This is one of the best MySQL tricks on the market. We're going to reverse-travel a folder path using LEFT JOIN and the incredible power of metacoded SQL + $sql = 'SELECT gm.img_id, gm.img_title, gm.is_folder, g0.img_title AS folder_name, g0.img_id AS folder_id FROM '.table_prefix.'gallery AS gm' . "\n " . 'LEFT JOIN '.table_prefix.'gallery AS g0' . "\n " . 'ON ( gm.folder_parent = g0.img_id )'; + $where = "\n " . 'WHERE g0.img_title=\'' . $db->escape($folders[0]) . '\''; + foreach ( $folders as $i => $folder ) + { + if ( $i == 0 ) + continue; + $i_dec = $i - 1; + $folder = $db->escape($folder); + $sql .= "\n LEFT JOIN ".table_prefix."gallery AS g{$i}\n ON ( g{$i}.img_id=g{$i_dec}.folder_parent AND g{$i}.img_title='$folder' )"; + $where .= "\n ".'AND g'.$i.'.img_id IS NOT NULL'; + } + $where .= "\n AND g{$i}.folder_parent IS NULL"; + $sql .= $where . "\n ORDER BY is_folder DESC, gm.$sort_column $sort_order, gm.img_title ASC" . ';'; + } + + $img_query = $db->sql_query($sql); + if ( !$img_query ) + $db->_die('The folder ID could not be selected.'); + + if ( $db->numrows() < 1 ) + { + // Nothing in this folder, for one of two reasons: + // 1) The folder doesn't exist + // 2) The folder exists but doesn't have any images in it + + /* + $folders_old = $folders; + $folders = array( + 0 => $folders_old[0] + ); + $x = $folders_old; + unset($x[0]); + $folders = array_merge($folders, $x); + unset($x); + */ + // die('
' . print_r($folders, true) . ''); + + // This next query will try to determine if the folder itself exists + $sql = 'SELECT g0.img_id, g0.img_title FROM '.table_prefix.'gallery AS g0'; + $where = "\n " . 'WHERE g0.img_title=\'' . $db->escape($folders[0]) . '\''; + foreach ( $folders as $i => $folder ) + { + if ( $i == 0 ) + continue; + $i_dec = $i - 1; + $folder = $db->escape($folder); + $sql .= "\n LEFT JOIN ".table_prefix."gallery AS g{$i}\n ON ( g{$i}.img_id=g{$i_dec}.folder_parent AND g{$i}.img_title='$folder' )"; + $where .= "\n ".'AND g'.$i.'.img_id IS NOT NULL'; + } + $where .= "\n AND g{$i}.folder_parent IS NULL"; + $where .= "\n AND g0.is_folder=1"; + $sql .= $where . ';'; + + $nameq = $db->sql_query($sql); + if ( !$nameq ) + $db->_die(); + + if ( $db->numrows($nameq) < 1 ) + { + die_friendly('Folder not found', '
The folder you requested doesn\'t exist. Please check the URL and try again, or return to the gallery index.
'); + } + + $row = $db->fetchrow($nameq); + + // Generate title + $title = dirtify_page_id($row['img_title']); + $title = str_replace('_', ' ', $title); + $title = htmlspecialchars($title); + + $template->tpl_strings['PAGE_NAME'] = $title; + + $first_row = $row; + + $db->sql_data_seek(0, $img_query); + + /* $folders = $folders_old; */ + } + else if ( !empty($parms) ) + { + $row = $db->fetchrow($img_query); + $first_row = $row; + + // Generate title + $title = htmlspecialchars($row['folder_name']); + + $template->tpl_strings['PAGE_NAME'] = $title; + + $db->sql_data_seek(0, $img_query); + } + else + { + $row = $db->fetchrow($img_query); + $first_row = $row; + + $template->tpl_strings['PAGE_NAME'] = 'Image Gallery'; + $breadcrumbs = array('Gallery index'); + + $db->sql_data_seek(0, $img_query); + } + + $f_errors = array(); + + if ( $session->user_level >= USER_LEVEL_ADMIN && isset($_POST['create_folder']) && isset($first_row['folder_id']) ) + { + if ( empty($_POST['create_folder']) ) + { + $f_errors[] = 'Please enter a folder name.'; + } + if ( $_POST['create_folder'] == '_id' ) + { + $f_errors[] = 'The name "_id" is reserved for internal functions and cannot be used on any image or folder.'; + } + if ( count($f_errors) < 1 ) + { + $q = $db->sql_query('INSERT INTO '.table_prefix.'gallery(img_title, is_folder, folder_parent) VALUES(\'' . $db->escape($_POST['create_folder']) . '\', 1, ' . $first_row['folder_id'] . ');'); + if ( !$q ) + $db->_die(); + redirect(makeUrl($paths->fullpage), 'Folder created', 'The folder "' . htmlspecialchars($_POST['create_folder']) . '" has been created. Redirecting to last viewed folder...', 2); + } + } + + echo $header; + + if ( count($f_errors) > 0 ) + { + echo 'Error creating folder:
';
+ }
+
+ // From here, this breadcrumb stuff is a piece of... sourdough French bread :-) *smacks lips*
+ echo '- ' . implode('
- ', $f_errors) . '
';
+ // Upload image link for admins
+ if ( $session->user_level >= USER_LEVEL_ADMIN )
+ {
+ echo '
';
+
+ // "Edit all" link
+ if ( $row = $db->fetchrow($img_query) && $session->user_level >= USER_LEVEL_ADMIN )
+ {
+ $img_list = array();
+ $fol_list = array();
+ $all_list = array();
+ do
+ {
+ if ( $row === true && isset($first_row) )
+ {
+ $row = $first_row;
+ }
+ // die('';
+ echo 'Upload new image(s)';
+ echo '
';
+ }
+ // The actual breadcrumbs
+ echo '' . implode(' » ', $breadcrumbs) . '';
+ echo '' . var_dump($row) . $db->sql_backtrace() . ''); + if ( !$row['img_id'] ) + break; + $all_list[] = $row['img_id']; + if ( $row['is_folder'] == 1 ) + $fol_list[] = $row['img_id']; + else + $img_list[] = $row['img_id']; + } + while ( $row = $db->fetchrow($img_query) ); + + $all_list = implode(',', $all_list); + $fol_list = implode(',', $fol_list); + $img_list = implode(',', $img_list); + + if ( !empty($all_list) ) + { + echo '
+ Edit all in this folder: ';
+ if ( !empty($img_list) )
+ {
+ $edit_link = makeUrlNS('Special', 'GalleryUpload', 'edit_img=' . $img_list, true);
+ echo "images ";
+ }
+ if ( !empty($fol_list) )
+ {
+ $edit_link = makeUrlNS('Special', 'GalleryUpload', 'edit_img=' . $fol_list, true);
+ echo "folders ";
+ }
+ if ( !empty($img_list) && !empty($fol_list) )
+ {
+ $edit_link = makeUrlNS('Special', 'GalleryUpload', 'edit_img=' . $all_list, true);
+ echo "both ";
+ }
+ // " Bypass stupid jEdit bug
+ echo '
';
+ }
+ }
+
+ $url_sort_name_asc = makeUrl($paths->fullpage, 'sort=img_title&order=ASC', true);
+ $url_sort_name_desc = makeUrl($paths->fullpage, 'sort=img_title&order=DESC', true);
+ $url_sort_upl_asc = makeUrl($paths->fullpage, 'sort=img_time_upload&order=ASC', true);
+ $url_sort_mod_asc = makeUrl($paths->fullpage, 'sort=img_time_mod&order=ASC', true);
+ $url_sort_upl_desc = makeUrl($paths->fullpage, 'sort=img_time_upload&order=DESC', true);
+ $url_sort_mod_desc = makeUrl($paths->fullpage, 'sort=img_time_mod&order=DESC', true);
+
+ // "Sort by" selector (pure CSS!)
+ echo '
+ Sort by...
+
+
+ Create new folder';
+ echo '
';
+ echo '
';
+ echo ''; + } + + $template->footer(); + +} + +?> diff -r 000000000000 -r 7caf561c50ee plugins/gallery/chevron-prelight.gif Binary file plugins/gallery/chevron-prelight.gif has changed diff -r 000000000000 -r 7caf561c50ee plugins/gallery/chevron.gif Binary file plugins/gallery/chevron.gif has changed diff -r 000000000000 -r 7caf561c50ee plugins/gallery/denied.png Binary file plugins/gallery/denied.png has changed diff -r 000000000000 -r 7caf561c50ee plugins/gallery/dropdown.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/gallery/dropdown.css Wed Jul 25 16:36:26 2007 -0400 @@ -0,0 +1,76 @@ +div.select-outer { + border-width: 1px; + border-style: solid; + border-color: #FFFFFF; + padding: 3px 21px 3px 3px !important; + cursor: pointer; + display: table; + background-image: url(chevron.gif); + background-position: 95% 8px; + background-repeat: no-repeat; + background-color: #FFFFFF; + position: absolute; + font-family: arial, sans-serif; + font-size: 8pt; + margin: 4px 0 0 0 !important; + text-align: left; +} +div.select-outer:hover { + border-color: #CCCCCC; + background-image: url(chevron-prelight.gif); +} +div.select-inner { + display: none; + background-color: #FFFFFF; + margin-right: -18px; +} +div.select-outer:hover div.select-inner { + display: block; +} +div.select-inner a { + display: block; + padding: 2px; + color: #000000; +} +div.select-inner a:hover { + display: block; + color: #0000FF; + background-color: #F0F0FF; +} + +div.toggle { + border: 1px solid #2c458a; + background-color: #F0FDFF; + padding: 1px; + margin: 10px 0; +} + +div.toggle div.head { + line-height: 22px; + background-image: url(toggle-head-bg.gif); + padding: 2px 7px 0 7px; + margin: 0; + color: #FFFFFF; + cursor: pointer; +} + +div.toggle div.head img.toggler { + float: right; + margin: 3px; + display: block; +} + +div.toggle div.body { + background-color: #e3e7f3; + border: 1px solid #849ad6; + padding: 10px; + margin: 1px 0 0 0; + display: none; + max-height: 300px; + clip: rect(0px,auto,auto,0px); + overflow: auto; +} + +div.toggle div.body label:hover { + background-color: #f3f7ff; +} diff -r 000000000000 -r 7caf561c50ee plugins/gallery/fetcher.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/gallery/fetcher.php Wed Jul 25 16:36:26 2007 -0400 @@ -0,0 +1,116 @@ +attachHook('base_classes_initted', ' + global $paths; + $paths->add_page(Array( + \'name\'=>\'Image fetcher pagelet\', + \'urlname\'=>\'GalleryFetcher\', + \'namespace\'=>\'Special\', + \'special\'=>0,\'visible\'=>0,\'comments_on\'=>0,\'protected\'=>1,\'delvotes\'=>0,\'delvote_ips\'=>\'\', + )); + '); + +function page_Special_GalleryFetcher() +{ + global $db, $session, $paths, $template, $plugins; // Common objects + + $type = $paths->getParam(0); + if ( !in_array($type, array('thumb', 'preview', 'full')) ) + { + die('Hack attempt'); + } + + $id = intval($paths->getParam(1)); + if ( !$id ) + { + die('Hack attempt'); + } + + // Permissions object + $perms = $session->fetch_page_acl($id, 'Gallery'); + + if ( !$perms->get_permissions('gal_full_res') && $type == 'full' ) + { + $type = 'preview'; + } + + $q = $db->sql_query('SELECT img_filename, img_time_mod, is_folder FROM '.table_prefix.'gallery WHERE img_id=' . $id . ';'); + if ( !$q ) + $db->_die(); + + if ( $db->numrows() < 1 ) + die('Image not found'); + + $row = $db->fetchrow(); + + switch ( $type ) + { + case 'thumb': + $filename = ENANO_ROOT . '/cache/' . $row['img_filename'] . '-thumb.jpg'; + $mimetype = 'image/jpeg'; + break; + case 'preview': + $filename = ENANO_ROOT . '/cache/' . $row['img_filename'] . '-preview.jpg'; + $mimetype = 'image/jpeg'; + break; + case 'full': + $filename = ENANO_ROOT . '/files/' . $row['img_filename']; + $ext = get_file_extension($filename); + switch($ext) + { + case 'png': $mimetype = 'image/png'; break; + case 'gif': $mimetype = 'image/gif'; break; + case 'bmp': $mimetype = 'image/bmp'; break; + case 'jpg': case 'jpeg': $mimetype = 'image/jpeg'; break; + case 'tif': case 'tiff': $mimetype = 'image/tiff'; break; + default: $mimetype = 'application/octet-stream'; + } + break; + default: + die('PHP...insane...'); + break; + } + + // Make sure we have permission to read this image + if ( !$perms->get_permissions('read') ) + { + $filename = ENANO_ROOT . '/plugins/gallery/denied.png'; + $mimetype = 'image/png'; + } + + if ( $row['is_folder'] == '1' ) + { + $filename = ENANO_ROOT . '/plugins/gallery/folder.png'; + $mimetype = 'image/png'; + } + + if ( !file_exists($filename) ) + die('Can\'t retrieve image file ' . $filename); + + $contents = file_get_contents($filename); + + header('Content-type: ' . $mimetype); + header('Content-length: ' . strlen($contents)); + header('Last-Modified: ' . date('r', $row['img_time_mod'])); + + echo $contents; + +} + +?> diff -r 000000000000 -r 7caf561c50ee plugins/gallery/folder.png Binary file plugins/gallery/folder.png has changed diff -r 000000000000 -r 7caf561c50ee plugins/gallery/functions.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/gallery/functions.php Wed Jul 25 16:36:26 2007 -0400 @@ -0,0 +1,317 @@ +sql_query('SELECT img_title, img_id, folder_parent FROM '.table_prefix.'gallery WHERE img_id=' . $img_id . ';'); + if ( !$q ) + $db->_die(); + $row = $db->fetchrow(); + if ( !$row ) + { + break; + } + if ( $sanity > 1 ) + { + $ret[] = $row['img_title']; + } + if ( !$row['folder_parent'] ) + { + break; + } + if ( in_array($row['img_id'], $sanity_stack) ) + return array('Infinite loop'); + $sanity_stack[] = $row['img_id']; + $img_id = $row['folder_parent']; + } + return $ret; +} + +/** + * Generates a hierarchy of Gallery folders. + * @return array + */ + +function gallery_folder_hierarchy() +{ + global $db, $session, $paths, $template, $plugins; // Common objects + + $q = $db->sql_query('SELECT img_id, img_title, folder_parent FROM '.table_prefix.'gallery WHERE is_folder=1'); + if ( !$q ) + $db->_die(); + + if ( $db->numrows() < 1 ) + { + return array(); + } + + $lookup_table = array(); + $hier = array('_id' => 'NULL'); + $orphans = array(); + $persist_orphans = array(); + + while ( $row = $db->fetchrow() ) + { + if ( !$row['folder_parent'] ) + { + // root-level folder + $hier[ $row['img_title'] ] = array('_id' => $row['img_id']); + $lookup_table[$row['img_id']] =& $hier[ $row['img_title'] ]; + } + else if ( $row['folder_parent'] && isset($lookup_table[$row['folder_parent']]) ) + { + // child folder, parent is resolved + $lookup_table[ $row['folder_parent'] ][ $row['img_title'] ] = array('_id' => $row['img_id']); + $lookup_table[ $row['img_id'] ] =& $lookup_table[ $row['folder_parent'] ][ $row['img_title'] ]; + } + else if ( $row['folder_parent'] && !isset($lookup_table[$row['folder_parent']]) ) + { + // child folder, orphan as of yet + $orphans[] = $row; + } + } + + // Resolve orphans + do + { + $persist_orphans = array(); + while ( count($orphans) > 0 ) + { + $orphan =& $orphans[ ( count($orphans) - 1 ) ]; + if ( isset($lookup_table[$orphan['folder_parent']]) ) + { + $lookup_table[ $orphan['folder_parent'] ][ $orphan['img_title'] ] = array('_id' => $orphan['img_id']); + $lookup_table[ $orphan['img_id'] ] =& $lookup_table[ $orphan['folder_parent'] ][ $orphan['img_title'] ]; + } + else + { + $persist_orphans[] = $orphans[ ( count($orphans) - 1 ) ]; + //echo 'BUG: ' . htmlspecialchars($orphan['img_title']) . ' (' . $orphan['img_id'] . ') is an orphan folder (parent is ' . $orphan['folder_parent'] . '); placing in root
'; + // $hier[ $orphan['img_title'] ] = array(); + // $lookup_table[$orphan['img_id']] =& $hier[ $orphan['img_title'] ]; + } + unset($orphan, $orphans[ ( count($orphans) - 1 ) ]); + } + $orphans = $persist_orphans; + //die('insanity:
'.print_r($hier,true).print_r($lookup_table,true).print_r($persist_orphans,true).''); + } + while ( count($persist_orphans) > 0 ); + + return $hier; + +} + +/** + * Generates HTML for a folder selector. + * @param string The form field name, defaults to folder_id. + * @param bool Whether to auto-select the root or not. Defaults to true. + * @return string + */ + +function gallery_hier_formfield($field_name = 'folder_id', $autosel = true) +{ + $hier = gallery_folder_hierarchy(); + $img_join = scriptPath . '/images/icons/joinbottom.gif'; + $img_join_term = scriptPath . '/images/icons/join.gif'; + $img_line = scriptPath . '/images/icons/line.gif'; + $img_empty = scriptPath . '/images/icons/empty.gif'; + + $html = _gallery_hier_form_inner($hier, '
'; + + if ( count($el) > 1 ) + { + // Writing this image logic sucked. + $count = 0; + foreach ( $el as $key => $el_lower ) + { + $count++; + if ( $key == '_id' ) + continue; + $depth_mod = $depth_img; + $last = ( $count == count($el) ); + + for ( $i = 0; $i < count($depth_mod); $i++ ) + { + if ( $depth_mod[$i] == $img_join_term || $depth_mod[$i] == $img_empty ) + $depth_mod[$i] = $img_empty; + else + $depth_mod[$i] = $img_line; + } + + if ( $last ) + $depth_mod[] = $img_join_term; + else + $depth_mod[] = $img_join; + + $html .= _gallery_hier_form_inner($el_lower, $key, $fname, ( $depth + 1 ), $depth_mod, $img_join, $img_join_term, $img_line, $img_empty); + } + } + return $html; +} + +/** + * Returns an array containing the IDs of all of the given folder ID's children. Recursive function. + * @param int ID of folder + */ + +function gal_fetch_all_children($id) +{ + global $db, $session, $paths, $template, $plugins; // Common objects + + if ( !is_int($id) ) + { + die('not int'); + return false; + } + + $children = array(); + + $q = $db->sql_query('SELECT img_id,is_folder FROM '.table_prefix.'gallery WHERE folder_parent=' . $id . ';'); + if ( !$q ) + $db->_die(); + if ( $db->numrows() < 1 ) + { + return $children; + } + $folders = array(); + while ( $row = $db->fetchrow() ) + { + $children[] = intval($row['img_id']); + if ( $row['is_folder'] == 1 ) + $folders[] = intval($row['img_id']); + } + foreach ( $folders as $folder ) + { + $grandchildren = gal_fetch_all_children($folder); + if ( $grandchildren === false ) + { + return false; + } + $children = array_merge($children, $grandchildren); + } + + return $children; + +} + +/** + * Lists all normal files within a given directory. Recursive function. Can also return the list of directories in the second parameter by reference. + * @param string Directory to search + * @param array Variable in which to store + * @return array Not multi-depth + */ + +function gal_dir_recurse($dir, &$dirlist) +{ + $dir_handle = opendir($dir); + if ( !$dir_handle ) + return false; + $entries = array(); + $dirlist = array(); + while ( true ) + { + $file = readdir($dir_handle); + if ( !$file ) + break; + if ( $file == '.' || $file == '..' ) + continue; + $file = $dir . '/' . $file; + if ( is_dir($file) ) + { + $children = gal_dir_recurse($file, $dirtemp); + $dirlist[] = $file; + $dirlist = array_merge($dirlist, $dirtemp); + $entries = array_merge($entries, $children); + } + else if ( is_file($file) ) + { + $entries[] = $file; + } + else + { + die($file . ' is not a file or directory'); + } + } + closedir($dir_handle); + return $entries; +} + +?> diff -r 000000000000 -r 7caf561c50ee plugins/gallery/gallery-bits.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/gallery/gallery-bits.js Wed Jul 25 16:36:26 2007 -0400 @@ -0,0 +1,24 @@ +/* + * Misc functions for Enano.Img Gallery. + */ + +function gal_toggle(elem, img, img_open, img_close) +{ + if ( !img_close || !img_open ) + { + img_close = scriptPath + '/plugins/gallery/toggle-closed.png'; + img_open = scriptPath + '/plugins/gallery/toggle-open.png'; + } + if ( elem.style.display == 'block' ) + { + elem.style.display = 'none'; + img.src = img_close; + } + else + { + elem.style.display = 'block'; + img.src = img_open; + } +} + + diff -r 000000000000 -r 7caf561c50ee plugins/gallery/next-prelight.gif Binary file plugins/gallery/next-prelight.gif has changed diff -r 000000000000 -r 7caf561c50ee plugins/gallery/next.gif Binary file plugins/gallery/next.gif has changed diff -r 000000000000 -r 7caf561c50ee plugins/gallery/nssetup.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/gallery/nssetup.php Wed Jul 25 16:36:26 2007 -0400 @@ -0,0 +1,31 @@ +attachHook('acl_rule_init', 'gallery_setup_namespace($this);'); + +function gallery_setup_namespace(&$paths) +{ + global $db, $session, $paths, $template, $plugins; // Common objects + + $paths->create_namespace('Gallery', 'Image:'); + + $session->register_acl_type('gal_full_res', AUTH_ALLOW, 'View image at full resolution', array('read'), 'Gallery'); + + $session->acl_extend_scope('read', 'Gallery', $paths); + $session->acl_extend_scope('post_comments', 'Gallery', $paths); + $session->acl_extend_scope('edit_comments', 'Gallery', $paths); + $session->acl_extend_scope('mod_comments', 'Gallery', $paths); +} + +?> diff -r 000000000000 -r 7caf561c50ee plugins/gallery/prev-prelight.gif Binary file plugins/gallery/prev-prelight.gif has changed diff -r 000000000000 -r 7caf561c50ee plugins/gallery/prev.gif Binary file plugins/gallery/prev.gif has changed diff -r 000000000000 -r 7caf561c50ee plugins/gallery/toggle-closed.png Binary file plugins/gallery/toggle-closed.png has changed diff -r 000000000000 -r 7caf561c50ee plugins/gallery/toggle-head-bg.gif Binary file plugins/gallery/toggle-head-bg.gif has changed diff -r 000000000000 -r 7caf561c50ee plugins/gallery/toggle-open.png Binary file plugins/gallery/toggle-open.png has changed diff -r 000000000000 -r 7caf561c50ee plugins/gallery/upload.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/gallery/upload.php Wed Jul 25 16:36:26 2007 -0400 @@ -0,0 +1,1063 @@ +attachHook('base_classes_initted', ' + global $paths; + $paths->add_page(Array( + \'name\'=>\'Image gallery upload\', + \'urlname\'=>\'GalleryUpload\', + \'namespace\'=>\'Special\', + \'special\'=>0,\'visible\'=>1,\'comments_on\'=>0,\'protected\'=>1,\'delvotes\'=>0,\'delvote_ips\'=>\'\', + )); + '); + +function page_Special_GalleryUpload() +{ + global $db, $session, $paths, $template, $plugins; // Common objects + + if ( $session->user_level < USER_LEVEL_ADMIN ) + { + die_friendly('Access denied', '
You need to have administrative rights to use the gallery\'s upload features.
'); + } + + $zip_support = ( class_exists('ZipArchive') || ( file_exists('/usr/bin/unzip') && is_executable('/usr/bin/unzip') ) ); + + $errors = array(); + $template->add_header(''); + $template->add_header(''); + + if ( isset($_GET['edit_img']) ) + { + $edit_parms = $_GET['edit_img']; + $regex = '/^((([0-9]+),)*)?([0-9]+?)$/'; + if ( !preg_match($regex, $edit_parms) ) + { + die_friendly('Bad request', '$_GET[\'edit_img\'] must be a comma-separated list of image IDs.
'); + } + + $idlist = explode(',', $edit_parms); + $num_edit = count($idlist); + $idlist = "SELECT img_id,img_title,img_desc,img_filename,is_folder FROM ".table_prefix."gallery WHERE img_id=" . implode(' OR img_id=', $idlist) . ';'; + + if ( !$e = $db->sql_query($idlist) ) + $db->_die(); + + $template->header(); + + if ( isset($_POST['edit_do_save']) ) + { + @set_time_limit(0); + + $arr_img_data = array(); + while ( $row = $db->fetchrow($e) ) + $arr_img_data[$row['img_id']] = $row; + + // Allow breaking out + switch(true):case true: + + if ( !is_array($_POST['img']) ) + { + $errors[] = 'No images passed to processor.'; + break; + } + + // Main updater loop + foreach ( $_POST['img'] as $img_id => $img_data ) + { + + if ( !preg_match('/^[0-9]+$/', $img_id) ) + { + $errors[] = 'SQL injection attempted!'; + break 2; + } + + // Array of columns to update + $to_update = array(); + + $key = 'reupload_' . $img_data['id']; + if ( isset($_FILES[$key]) ) + { + $file =& $_FILES[ $key ]; + if ( $file['tmp_name'] != '' ) + { + // Reupload + $filename = ENANO_ROOT . '/files/' . $arr_img_data[ $img_data['id'] ]['img_filename']; + if ( !unlink($filename) ) + { + $errors[] = "Could not delete $filename"; + break 2; + } + if ( !@move_uploaded_file($file['tmp_name'], $filename) ) + { + $errors[] = "Could not move uploaded file to $filename"; + break 2; + } + + // + // Create scaled images + // + + // Create thumbnail image + $thumb_filename = ENANO_ROOT . '/cache/' . $arr_img_data[ $img_data['id'] ]['img_filename'] . '-thumb.jpg'; + if ( !unlink($thumb_filename) ) + { + $errors[] = "Could not delete $thumb_filename"; + break 2; + } + $magick = getConfig('imagemagick_path'); + $command = "$magick '{$filename}' -resize ".'"'."80x80>".'"'." -quality 85 $thumb_filename"; + + @system($command, $stat); + + if ( !file_exists($thumb_filename) ) + { + $errors[] = 'Couldn\'t scale image '.$i.': ImageMagick failed us'; + break 2; + } + + // Create preview image + $preview_filename = ENANO_ROOT . '/cache/' . $arr_img_data[ $img_data['id'] ]['img_filename'] . '-preview.jpg'; + if ( !unlink($preview_filename) ) + { + $errors[] = "Could not delete $preview_filename"; + break 2; + } + $magick = getConfig('imagemagick_path'); + $command = "$magick '{$filename}' -resize ".'"'."640x640>".'"'." -quality 85 $preview_filename"; + + @system($command, $stat); + + if ( !file_exists($preview_filename) ) + { + $errors[] = 'Couldn\'t scale image '.$i.': ImageMagick failed us'; + break 2; + } + $to_update['img_time_mod'] = strval(time()); + } + } + + $vars = array( + 'year' => date('Y'), + 'month' => date('F'), + 'day' => date('d'), + 'time12' => date('g:i A'), + 'time24' => date('G:i') + ); + + // Image name/title + + $title = $template->makeParserText($img_data['title']); + $title->assign_vars($vars); + $executed = $title->run(); + if ( $executed == '_id' ) + { + $errors[] = 'You cannot name an image or folder "_id", this name is reserved for internal functions.'; + break 2; + } + if ( $executed == '' ) + { + $errors[] = 'Please enter a name for the item with unique ID ' . $img_data['id'] . '.' . print_r($_POST,true) . ''; + break 2; + } + $to_update['img_title'] = $executed; + + // Image description + + if ( isset($img_data['desc']) ) + { + $desc = $template->makeParserText($img_data['desc']); + $desc->assign_vars($vars); + $executed = $desc->run(); + $executed = RenderMan::preprocess_text($executed, false, false); + $to_update['img_desc'] = $executed; + } + + // Folder + $target_folder = false; + + if ( !empty($_POST['override_folder']) ) + { + if ( $_POST['override_folder'] == 'NULL' || preg_match('/^[0-9]+$/', $_POST['override_folder']) ) + { + $target_folder = $_POST['override_folder']; + } + } + + if ( !empty($img_data['folder']) ) + { + if ( $img_data['folder'] == 'NULL' || preg_match('/^[0-9]+$/', $img_data['folder']) ) + { + $target_folder = $img_data['folder']; + } + } + + if ( $target_folder ) + { + $to_update['folder_parent'] = $target_folder; + } + + if ( count($to_update) > 0 ) + { + $up_keys = array_keys($to_update); + $up_vals = array_values($to_update); + + $bin_cols = array('folder_parent'); + + $sql = 'UPDATE ' . table_prefix.'gallery SET '; + + foreach ( $up_keys as $i => $key ) + { + if ( in_array($key, $bin_cols) ) + { + $sql .= $key . '=' . $up_vals[$i] . ','; + } + else + { + $sql .= $key . '=\'' . $db->escape($up_vals[$i]) . '\','; + } + } + + $sql = preg_replace('/,$/i', '', $sql) . ' WHERE img_id=' . $img_data['id'] . ';'; + + if ( !$db->sql_query($sql) ) + { + $db->_die(); + } + + } + + } + + echo '
Your changes have been saved.
';
+
+ endswitch;
+
+ // Rerun select query to make sure information in PHP memory is up-to-date
+ if ( !$e = $db->sql_query($idlist) )
+ $db->_die();
+
+ }
+
+ if ( count($errors) > 0 )
+ {
+ echo '
+ The following errors were encountered while updating the image data:
+
';
+ }
+
+ ?>
+
+ ';
+
+ if ( $row = $db->fetchrow($e) )
+ {
+
+ echo '+
-
+
- ' . implode(" \n
- ", $errors) . ' +
+ ';
+ echo '
+
';
+
+ $i = 0;
+ do
+ {
+ $thumb_url = makeUrlNS('Special', 'GalleryFetcher/thumb/' . $row['img_id'], false, true);
+
+ # Type: folder
+ if ( $row['is_folder'] == 1 ):
+
+ // Image ID tracker
+ echo '';
+
+ //
+ // Editor table
+ //
+
+ $folders = gallery_imgid_to_folder(intval($row['img_id']));
+ foreach ( $folders as $j => $xxx )
+ {
+ $folder =& $folders[$j];
+ $folder = sanitize_page_id($folder);
+ }
+ $folders = array_reverse($folders);
+ $gal_href = implode('/', $folders) . '/' . sanitize_page_id($row['img_title']);
+
+ echo '| Information |
|---|
+ As with the upload form, the following variables can be used. Note that when editing images, the {id} and {autotitle} variables will be ignored.';
+ ?>
+
|
+ ';
+
+ echo '
| Folder: ' . htmlspecialchars($row['img_title']) . ' | ||||
|---|---|---|---|---|
| Unique ID: | +' . $row['img_id'] . ' (view folder contents) | +|||
| Parent folders: | +' . /* Yeah it's dirty, but hey, it gets the job done ;-) */ ( ( $x = str_replace('»', '»', htmlspecialchars(str_replace('_', ' ', implode(' » ', $folders)))) ) ? $x : '<in root>' ) . ' | +|||
| Folder name: | ++ | |||
| Move to folder: | +
+
+
+
+
+ 
+ Select folder
+
+
+
+ + Unselect field + |
+ |||
| Image: ' . htmlspecialchars($row['img_title']) . ' | |
|---|---|
| Unique ID: | +' . $row['img_id'] . ' (view image\'s page) | +
| Thumbnail: | +|
| Image title: | ++ |
| Image description: | ++ |
| Permissions: | +Only works in Firefox 1.5 or later, Safari 3.x or later, or Opera 9.0 or later. |
+
| Move to folder: | +
+
+
+
+
+
+ Select folder
+
+
+
+ + Unselect field + |
+ Upload new version: | ++ '; + + // Finish table + echo ' |
+ ';
+ // Mover widget
+ if ( $num_edit > 1 ):
+ ?>
+
+
';
+
+ }
+ else
+ {
+ echo '| Move all to folder: Other folder fields on this page can override this for individual images. |
+
+
+
+
+
+
+ Select folder
+
+
+
+ + Unselect folder override field + |
+ '; + echo ' |
|---|
No images that matched the ID list could be found.
'; + } + + echo ''; + + $template->footer(); + return; + } + + if ( isset($_GET['rm']) ) + { + $warnings = array(); + + if ( !preg_match('/^[0-9]+$/', $_GET['rm']) ) + die_friendly('Bad Request', '$_GET[rm] needs to be an integer.
'); + + $rm_id = intval($_GET['rm']); + + if ( isset($_POST['confirmed']) ) + { + // The user confirmed the request. Start plowing through data to decide what to delete. + + // Array of images and folder rows to delete + $del_imgs = array($rm_id); + // Array of files to delete + $del_files = array(); + // Array of comment entries to delete + $del_comments = array(); + + $all_children = gal_fetch_all_children($rm_id); + $del_imgs = array_merge($del_imgs, $all_children); + + $imglist = 'img_id=' . implode(' OR img_id=', $del_imgs); + $sql = "SELECT img_id, img_filename FROM ".table_prefix."gallery WHERE ( $imglist ) AND is_folder!=1;"; + + if ( !$db->sql_query($sql) ) + { + $db->_die(); + } + + while ( $row = $db->fetchrow() ) + { + $files = array( + ENANO_ROOT . '/files/' . $row['img_filename'], + ENANO_ROOT . '/cache/' . $row['img_filename'] . '-thumb.jpg', + ENANO_ROOT . '/cache/' . $row['img_filename'] . '-preview.jpg' + ); + $del_files = array_merge($del_files, $files); + + $del_comments[] = intval($row['img_id']); + } + + $commentlist = 'page_id=\'' . implode('\' OR page_id=\'', $del_imgs) . '\''; + + // Main deletion cycle + + foreach ( $del_files as $file ) + { + @unlink($file) or $warnings[] = 'Could not delete file ' . $file; + } + + if ( !$db->sql_query('DELETE FROM '.table_prefix.'gallery WHERE ' . $imglist . ';') ) + { + $warnings[] = 'Main delete query failed: ' . $db->get_error(); + } + + if ( !$db->sql_query('DELETE FROM '.table_prefix.'comments WHERE ( ' . $commentlist . ' ) AND namespace=\'Gallery\';') ) + { + $warnings[] = 'Comment delete query failed: ' . $db->get_error(); + } + + if ( count($warnings) > 0 ) + { + $template->header(); + + echo 'Error during deletion process
'; + echo 'The deletion process generated some warnings which are shown below.
'; + echo '- ' . implode('
- ', $warnings) . '
+ The following errors were encountered during the upload:
+
';
+ }
+ ?>
+ +
-
+
- ' . implode(" \n
- ", $errors) . ' +
+
+
+
+
+
+ ';
+
+ $template->footer();
+
+}
+
+?>
diff -r 000000000000 -r 7caf561c50ee plugins/gallery/viewimage.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/gallery/viewimage.php Wed Jul 25 16:36:26 2007 -0400
@@ -0,0 +1,270 @@
+attachHook('page_not_found', 'gallery_namespace_handler($this);');
+
+function gallery_namespace_handler(&$page)
+{
+ global $db, $session, $paths, $template, $plugins; // Common objects
+
+ if ( $page->namespace != 'Gallery' )
+ return false;
+
+ if ( $page->page_id == 'Root' )
+ {
+ page_Special_Gallery();
+ return true;
+ }
+
+ if ( preg_match('/^[0-9]+$/', $page->page_id) )
+ {
+ $img_id = intval($page->page_id);
+ if ( !$img_id )
+ return false;
+ $q = $db->sql_query('SELECT img_id, img_title, img_desc, print_sizes, img_time_upload, img_time_mod, folder_parent FROM '.table_prefix.'gallery WHERE img_id=' . $img_id . ';');
+ if ( !$q )
+ $db->_die();
+ }
+ else
+ {
+ // Ech... he sent us a string... parse it and see what we get
+ if ( strstr($page->page_id, '/') )
+ {
+ $folders = explode('/', $page->page_id);
+ }
+ else
+ {
+ $folders = array($page->page_id);
+ }
+ foreach ( $folders as $i => $_crap )
+ {
+ $folder =& $folders[$i];
+ $folder = dirtify_page_id($folder);
+ $folder = str_replace('_', ' ', $folder);
+ }
+ unset($folder);
+
+ $folders = array_reverse($folders);
+ // This is one of the best MySQL tricks on the market. We're going to reverse-travel a folder path using LEFT JOIN and the incredible power of metacoded SQL
+ $sql = 'SELECT g0.img_id, g0.img_title, g0.img_desc, g0.print_sizes, g0.img_time_upload, g0.img_time_mod, g0.folder_parent FROM '.table_prefix.'gallery AS g0';
+ $where = "\n " . 'WHERE g0.img_title=\'' . $db->escape($folders[0]) . '\'';
+ foreach ( $folders as $i => $folder )
+ {
+ if ( $i == 0 )
+ continue;
+ $i_dec = $i - 1;
+ $folder = $db->escape($folder);
+ $sql .= "\n LEFT JOIN ".table_prefix."gallery AS g{$i}\n ON ( g{$i}.img_id=g{$i_dec}.folder_parent AND g{$i}.img_title='$folder' )";
+ $where .= "\n ".'AND g'.$i.'.img_id IS NOT NULL';
+ }
+ $where .= "\n AND g{$i}.folder_parent IS NULL";
+ $sql .= $where . ';';
+
+ if ( !$db->sql_query($sql) )
+ {
+ $db->_die('The image metadata could not be loaded.');
+ }
+
+ // Now that the folder data is no longer needed, we can fool around with it a little
+ $folders = $page->page_id;
+ if ( !strstr($folders, '/') )
+ {
+ $hier = '/';
+ }
+ else
+ {
+ $hier = preg_replace('/\/([^\/]+)$/', '/', $folders);
+ $hier = sanitize_page_id($hier);
+ }
+
+ }
+ if ( $db->numrows() < 1 )
+ {
+ // Image not found - show custom error message
+ $template->header();
+ echo '| Upload images to gallery | +|
|---|---|
| Image name template: | ++ |
| Image description template: | ++ |
|
+ The name and description templates can contain the following variables: +
Example: + |
+ |
|
+ Image files:
+
+ + Your server has support for zip files. + Instead of uploading many image files, you can upload a single zip file here. Note that if you send a zip file through, + it must be the first and only file or it will be ignored. Any files in the zip archive that are not supported image + files will be ignored. + The maximum file size is {$sz}B."; + } + ?> + + + |
+
+ + + + + + + + |
+
| Upload to folder: | +
+
+
+
+
+
+ Select folder
+
+
+
+ |
+
| + Please press the Upload button only once! Depending on the size of your image files and the speed of your connection, the upload may take several minutes. + | +
+ + |
+
|---|
There is no image in the gallery with this ID.
'; + echo 'You have requested an image that couldn\'t be looked up. Please check the URL and try again, or visit the Gallery index.
'; + $template->footer(); + return false; + } + $row = $db->fetchrow(); + + $db->free_result(); + + $img_id = $row['img_id']; + + if ( !$row['folder_parent'] ) + $row['folder_parent'] = ' IS NULL'; + else + $row['folder_parent'] = '=' . $row['folder_parent']; + + // Fetch image parent properties + $q = $db->sql_query('SELECT img_id, img_title FROM '.table_prefix.'gallery WHERE folder_parent' . $row['folder_parent'] . ' AND is_folder!=1 ORDER BY img_title ASC;'); + if ( !$q ) + $db->_die(); + + $folder_total = $db->numrows(); + $folder_this = 0; + $prev = false; + $next = false; + $next_title = ''; + $prev_title = ''; + + $i = 0; + + while ( $r = $db->fetchrow() ) + { + $i++; + if ( $i == $folder_total && $r['img_id'] == $img_id ) + { + $folder_this = $i; + $next = false; + } + else if ( $i < $folder_total && $r['img_id'] == $img_id ) + { + $folder_this = $i; + $next = true; + } + else + { + if ( $next ) + { + $next = $r['img_id']; + $next_title = $r['img_title']; + break; + } + $prev = $r['img_id']; + $prev_title = $r['img_title']; + } + } + + if ( $next ) + { + $next_sanitized = sanitize_page_id($next_title); + $next_url = ( isset($hier) ) ? makeUrlNS('Gallery', $hier . $next_sanitized ) : makeUrlNS('Gallery', $next); + } + if ( $prev ) + { + $prev_sanitized = sanitize_page_id($prev_title); + $prev_url = ( isset($hier) ) ? makeUrlNS('Gallery', $hier . $prev_sanitized ) : makeUrlNS('Gallery', $prev); + } + + $db->free_result(); + + $template->tpl_strings['PAGE_NAME'] = 'Gallery image: ' . htmlspecialchars($row['img_title']); + $title_spacey = strtolower(htmlspecialchars($row['img_title'])); + + $perms = $session->fetch_page_acl(strval($img_id), 'Gallery'); + + $template->header(); + + $img_id = intval($img_id); + $bc_folders = gallery_imgid_to_folder($img_id); + $bc_folders = array_reverse($bc_folders); + $bc_url = ''; + $breadcrumbs = array(); + $breadcrumbs[] = 'Gallery index'; + + foreach ( $bc_folders as $folder ) + { + $bc_url .= '/' . dirtify_page_id($folder); + $breadcrumbs[] = '' . htmlspecialchars($folder) . ''; + } + + $breadcrumbs[] = htmlspecialchars($row['img_title']); + + // From here, this breadcrumb stuff is a piece of... sourdough French bread :-) *smacks lips* + echo '';
+ // The actual breadcrumbs
+ echo '' . implode(' » ', $breadcrumbs) . '';
+ echo '
';
+
+ echo '';
+ $img_url = makeUrlNS('Special', 'GalleryFetcher/preview/' . $img_id);
+ $img_href = makeUrlNS('Special', 'GalleryFetcher/full/' . $img_id);
+
+ if ( $perms->get_permissions('gal_full_res') )
+ {
+ echo '';
+ }
+
+ echo '
';
+
+ if ( $perms->get_permissions('gal_full_res') )
+ {
+ echo '';
+ }
+
+ echo '
';
+ echo '
';
+
+ if ( $session->user_level >= USER_LEVEL_ADMIN )
+ {
+ echo '';
+
+ // Prev button
+ if ( $prev )
+ echo ' ';
+ //echo ' | '; + // if ( $prev ) + // echo 'previous image'; + + echo ' | '; + + // Image title + echo $title_spacey; + + echo ' | '; + + // Next button + if ( $next ) + // echo 'next image'; + //echo ' | ';
+ if ( $next )
+ echo ' ';
+
+ echo ' |
| ' . "image $folder_this of $folder_total" . ' | ||||
[ edit image ]
';
+ }
+
+ if ( !empty($row['img_desc']) )
+ {
+ echo 'Image description
'; + + $desc = RenderMan::render($row['img_desc']); + echo $desc; + } + + echo '
+ ';
+
+ // By the time I got to this point, it was 1:32AM (I was on vacation) and my 5-hour playlist on my iPod had been around about 3 times today.
+ // So I'm glad this is like the last thing on the list tonight.
+
+ echo '
';
+
+ $template->footer();
+
+}
+
+?>
| Image details | |
|---|---|
| Uploaded: | ' . date('F d, Y h:i a', $row['img_time_upload']) . ' |
| Last modified: | ' . date('F d, Y h:i a', $row['img_time_mod']) . ' |