'; - - 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; + $html = ''; + foreach ( $depth_img as $sw ) + $html .= '
'; + + 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; } /** @@ -234,42 +234,42 @@ 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; - + 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; + } /** @@ -281,37 +281,37 @@ 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; + $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; } /** @@ -322,27 +322,27 @@ function snapr_json_decode($data) { - if ( defined('ENANO_ATLEAST_1_1') ) - { - try - { - $decoded = enano_json_decode($data); - } - catch ( Exception $e ) - { - $response = array( - 'mode' => 'error', - 'error' => 'Exception in JSON parser.' - ); - die(enano_json_encode($response)); - } - } - else - { - $json = new Services_JSON(SERVICES_JSON_LOOSE_TYPE); - $decoded = $json->decode($data); - } - return ( isset($decoded) ) ? $decoded : false; + if ( defined('ENANO_ATLEAST_1_1') ) + { + try + { + $decoded = enano_json_decode($data); + } + catch ( Exception $e ) + { + $response = array( + 'mode' => 'error', + 'error' => 'Exception in JSON parser.' + ); + die(enano_json_encode($response)); + } + } + else + { + $json = new Services_JSON(SERVICES_JSON_LOOSE_TYPE); + $decoded = $json->decode($data); + } + return ( isset($decoded) ) ? $decoded : false; } /** @@ -353,27 +353,201 @@ function snapr_json_encode($data) { - if ( defined('ENANO_ATLEAST_1_1') ) - { - try - { - $encoded = enano_json_encode($data); - } - catch ( Exception $e ) - { - $response = array( - 'mode' => 'error', - 'error' => 'Exception in JSON encoder.' - ); - die(enano_json_encode($response)); - } - } - else - { - $json = new Services_JSON(SERVICES_JSON_LOOSE_TYPE); - $encoded = $json->encode($data); - } - return ( isset($encoded) ) ? $encoded : false; + if ( defined('ENANO_ATLEAST_1_1') ) + { + try + { + $encoded = enano_json_encode($data); + } + catch ( Exception $e ) + { + $response = array( + 'mode' => 'error', + 'error' => 'Exception in JSON encoder.' + ); + die(enano_json_encode($response)); + } + } + else + { + $json = new Services_JSON(SERVICES_JSON_LOOSE_TYPE); + $encoded = $json->encode($data); + } + return ( isset($encoded) ) ? $encoded : false; +} + +/** + * Is the given file extension allowed? + * @param string + * @return bool + */ + +function snapr_extension_allowed($ext) +{ + $allowedext = array('png', 'jpg', 'jpeg', 'tiff', 'tif', 'bmp', 'gif'); + return in_array(strtolower($ext), $allowedext); +} + +/** + * Process (make thumbnails for) an uploaded image. + * @param int image_id + * @return bool + */ + +function snapr_process_image($image_id) +{ + global $db, $session, $paths, $template, $plugins; // Common objects + + $q = $db->sql_query('SELECT img_filename FROM ' . table_prefix . "gallery WHERE img_id = $image_id AND processed = 0 AND is_folder = 0;"); + if ( !$q ) + $db->_die(); + if ( $db->numrows() < 1 ) + { + $db->free_result(); + return false; + } + list($filename) = $db->fetchrow_num($q); + $db->free_result(); + + $orig_path = ENANO_ROOT . "/files/$filename"; + $thumb = ENANO_ROOT . "/cache/$filename-thumb.jpg"; + $preview = ENANO_ROOT . "/cache/$filename-preview.jpg"; + + // create thumbnail + if ( !scale_image($orig_path, $thumb, 80, 80, true) ) + return false; + // create preview + if ( !scale_image($orig_path, $preview, 640, 1000, true) ) + return false; + + $q = $db->sql_query('UPDATE ' . table_prefix . "gallery SET processed = 1 WHERE img_id = $image_id;"); + if ( !$q ) + $db->_die(); + + return true; } -?> +/** + * Simple function to add an image to the database. Needs only the file path and the folder to put it in. + * @param string Filename + * @param int Folder, defaults to NULL (root) + * @return int image ID + */ + +function snapr_insert_image($path, $folder_id = NULL) +{ + global $db, $session, $paths, $template, $plugins; // Common objects + + $ext = get_file_extension($path); + $ourfilename = gallery_make_filename() . "." . strtolower($ext); + if ( !snapr_extension_allowed($ext) ) + return false; + + // copy the file to the storage folder + if ( !rename($path, ENANO_ROOT . "/files/$ourfilename") ) + return false; + + // insert the image into the database + $folder = $folder_id === NULL ? 'NULL' : strval(intval($folder_id)); + $title = ucwords(str_replace('_', ' ', basename($path))); + $title = preg_replace("/\.{$ext}\$/i", '', $title); + $sz = serialize(array()); + $now = time(); + $q = $db->sql_query('INSERT INTO ' . table_prefix . "gallery(is_folder, folder_parent, img_title, print_sizes, img_filename, img_time_upload, img_time_mod, img_tags, img_author, processed) VALUES\n" + . " (0, $folder, '$title', '$sz', '$ourfilename', $now, $now, '[]', $session->user_id, 0);"); + if ( !$q ) + $db->_die(); + + return $db->insert_id(); +} + +/** + * Process an uploaded zip file. + * @param string Zip file + * @param int Folder ID, defaults to NULL (root) + * @return array of image IDs + */ + +function snapr_process_zip($path, $folder_id = NULL) +{ + error_reporting(E_ALL); + + if ( !mkdir(ENANO_ROOT . '/cache/temp') ) + return false; + $temp_dir = tempnam(ENANO_ROOT . '/cache/temp', 'galunz'); + if ( file_exists($temp_dir) ) + unlink($temp_dir); + @mkdir($temp_dir); + + // Extract the zip file + if ( class_exists('ZipArchive') ) + { + $zip = new ZipArchive(); + $op = $zip->open($file['tmp_name']); + if ( !$op ) + { + return false; + } + $op = $zip->extractTo($temp_dir); + if ( !$op ) + { + return false; + } + } + else if ( file_exists('/usr/bin/unzip') ) + { + $cmd = "/usr/bin/unzip -qq -d '$temp_dir' {$path}"; + system($cmd); + } + + // Any files? + $file_list = gal_dir_recurse($temp_dir, $dirs); + if ( !$file_list ) + { + return false; + } + if ( count($file_list) < 1 ) + { + return false; + } + + $dirs = array_reverse($dirs); + $img_files = array(); + + // Loop through and add files + foreach ( $file_list as $file ) + { + $ext = get_file_extension($file); + + if ( snapr_extension_allowed($ext) ) + { + $img_files[] = $file; + } + else + { + unlink($file); + } + } + + // Main storage loop + $results = array(); + foreach ( $img_files as $file ) + { + $result = snapr_insert_image($file, $folder_id); + if ( $result !== false ) + $results[] = $result; + } + + // clean up + foreach ( $dirs as $dir ) + { + rmdir($dir); + } + + if ( !rmdir( $temp_dir ) ) + return false; + if ( !rmdir( ENANO_ROOT . '/cache/temp' ) ) + return false; + + return $results; +}