From 1de10bd66f761f8b66dcaecd28f5c2547b754ff3 Mon Sep 17 00:00:00 2001 From: z0rglub Date: Sun, 25 May 2003 08:31:39 +0000 Subject: search improved git-svn-id: http://piwigo.org/svn/trunk@17 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/configuration.php | 8 +- admin/miseajour.php | 531 ------------------------------------------------ 2 files changed, 4 insertions(+), 535 deletions(-) delete mode 100644 admin/miseajour.php (limited to 'admin') diff --git a/admin/configuration.php b/admin/configuration.php index 75be943db..300466bb8 100644 --- a/admin/configuration.php +++ b/admin/configuration.php @@ -242,7 +242,7 @@ if ( $_GET['valider'] == 1 ) $query.= "'".$_POST[$default_user_infos[$i]]."'"; } } - $query.= " where pseudo = 'visiteur';"; + $query.= " where username = 'guest';"; mysql_query( $query ); } //--------------------------------------------------------- data initialization @@ -795,18 +795,18 @@ $vtp->closeSession( $sub, 'line' ); // maxwidth for thumbnail $vtp->addSession( $sub, 'line' ); $vtp->addSession( $sub, 'param_line' ); -$vtp->setVar( $sub, 'param_line.name', $lang['conf_upload_maxwidth_thumbnail'] ); +$vtp->setVar( $sub, 'param_line.name',$lang['conf_upload_maxwidth_thumbnail']); $vtp->addSession( $sub, 'text' ); $vtp->setVar( $sub, 'text.name', 'upload_maxwidth_thumbnail' ); $vtp->setVar( $sub, 'text.value', $upload_maxwidth_thumbnail ); $vtp->closeSession( $sub, 'text' ); -$vtp->setVar( $sub, 'param_line.def', $lang['conf_upload_maxwidth_thumbnail_info'] ); +$vtp->setVar($sub,'param_line.def',$lang['conf_upload_maxwidth_thumbnail_info']); $vtp->closeSession( $sub, 'param_line' ); $vtp->closeSession( $sub, 'line' ); // maxheight for thumbnail $vtp->addSession( $sub, 'line' ); $vtp->addSession( $sub, 'param_line' ); -$vtp->setVar( $sub, 'param_line.name', $lang['conf_upload_maxheight_thumbnail'] ); +$vtp->setVar( $sub,'param_line.name',$lang['conf_upload_maxheight_thumbnail']); $vtp->addSession( $sub, 'text' ); $vtp->setVar( $sub, 'text.name', 'upload_maxheight_thumbnail' ); $vtp->setVar( $sub, 'text.value', $upload_maxheight_thumbnail ); diff --git a/admin/miseajour.php b/admin/miseajour.php deleted file mode 100644 index 53ce3371d..000000000 --- a/admin/miseajour.php +++ /dev/null @@ -1,531 +0,0 @@ -".$result['name'][0]." [ dir : ".$result['last_dir']." ] -
"; - - // 2. we search pictures of the category only if the update is for all or a cat_id is specified - if ( isset( $page['cat'] ) || $HTTP_GET_VARS['update'] == 'all' ) - { - insert_local_image( $cat_directory, $cat_id ); - update_cat_info( $cat_id ); - } - } - - // 3. we have to remove the categories of the database not present anymore - $query = "select id from $prefixeTable"."categories"; - $query.= " where site_id = $site_id"; - if ( !is_numeric( $cat_id ) ) - { - $query.= " and id_uppercat is NULL;"; - } - else - { - $query.= " and id_uppercat = $cat_id;"; - } - $result = mysql_query( $query ); - while ( $row = mysql_fetch_array( $result ) ) - { - // retrieving the directory - $rep = "../galleries"; - $resultat = get_cat_info( $row['id'] ); - $rep.= "/".$resultat['local_dir']; - - // is the directory present ? - if ( !is_dir( $rep ) ) - { - delete_category( $row['id'] ); - } - } - - // 4. retrieving the sub-directories - $sub_rep = array(); - $i = 0; - $dirs = ""; - if ( $opendir = opendir ( $cat_directory ) ) - { - while ( $file = readdir ( $opendir ) ) - { - if ( $file != "." && $file != ".." && is_dir ( $cat_directory."/".$file ) && $file != "thumbnail" ) - { - $sub_rep[$i++] = $file; - } - } - } - - for ( $i = 0; $i < sizeof( $sub_rep ); $i++ ) - { - // 5. is the category already existing ? we create a subcat if not existing - $category_id = ""; - $query = "select id from $prefixeTable"."categories"; - $query.= " where site_id = $site_id"; - $query.= " and dir = '".$sub_rep[$i]."'"; - if ( !is_numeric( $cat_id ) ) - { - $query.= " and id_uppercat is NULL;"; - } - else - { - $query.= " and id_uppercat = $cat_id;"; - } - $result = mysql_query( $query ); - if ( mysql_num_rows( $result ) == 0 ) - { - // we have to create the category - $query = "insert into $prefixeTable"."categories (dir,site_id,id_uppercat) values ('".$sub_rep[$i]."','$site_id'"; - if ( !is_numeric( $cat_id ) ) - { - $query.= ",NULL"; - } - else - { - $query.= ",'$cat_id'"; - } - $query.= ");"; - mysql_query( $query ); - $category_id = mysql_insert_id(); - } - else - { - // we get the already registered id - $row = mysql_fetch_array( $result ); - $category_id = $row['id']; - } - // 6. recursive call - insert_local_category( $category_id ); - } - - if ( is_numeric( $cat_id ) ) - { - echo " -
"; - } - } - - function insert_local_image( $rep, $category_id ) - { - global $prefixeTable,$lang,$conf,$count_new; - - // we have to delete all the images from the database that : - // - are not in the directory anymore - // - don't have the associated thumbnail available anymore - $query = "select id,file,tn_ext from $prefixeTable"."images"; - $query.= " where cat_id = $category_id;"; - $result = mysql_query( $query ); - while ( $row = mysql_fetch_array( $result ) ) - { - $lien_image = $rep."/".$row['file']; - $lien_thumbnail = $rep."/"."thumbnail/".$conf['prefixe_thumbnail'].substr( $row['file'], 0, strrpos( $row['file'], "." ) ).".".$row['tn_ext']; - - if ( !is_file ( $lien_image ) || !is_file ( $lien_thumbnail ) ) - { - if ( !is_file ( $lien_image ) ) - { - echo $row['file']." ".$lang['update_disappeared']."
"; - } - if ( !is_file ( $lien_thumbnail ) ) - { - echo $row['file']." : ".$lang['update_disappeared_tn']."
"; - } - // suppression de la base : - delete_image( $row['id'] ); - } - } - - // searching the new images in the directory - $pictures = array(); - $i = 0; - $tn_ext = ""; - $root = ""; - if ( $opendir = opendir ( $rep ) ) - { - while ( $file = readdir ( $opendir ) ) - { - if ( is_file( $rep."/".$file ) && is_image( $rep."/".$file ) ) - { - // is the picture waiting for validation by an administrator ? - $query = "select id from $prefixeTable"."waiting"; - $query.= " where cat_id = $category_id"; - $query.= " and file = '$file';"; - $result = mysql_query( $query ); - if ( mysql_num_rows( $result ) == 0 ) - { - if ( $tn_ext = TN_exist( $rep, $file ) ) - { - // is the picture already in the database ? - $query = "select id from $prefixeTable"."images"; - $query.= " where cat_id = $category_id"; - $query.= " and file = '$file';"; - $result = mysql_query( $query ); - if ( mysql_num_rows( $result ) == 0 ) - { - $pictures[$i] = array(); - $pictures[$i]['file'] = $file; - $pictures[$i]['tn_ext'] = $tn_ext; - $pictures[$i]['date'] = date( "Y-m-d", filemtime ( $rep."/".$file ) ); - $pictures[$i]['filesize'] = floor ( filesize( $rep."/".$file ) / 1024 ); - $image_size = @getimagesize( $rep."/".$file ); - $pictures[$i]['width'] = $image_size[0]; - $pictures[$i]['height'] = $image_size[1]; - $i++; - } - } - else - { - echo "".$lang['update_missing_tn']." : $file (".$conf['prefixe_thumbnail'].substr( $file, 0, strrpos( $file, "." ) ).".XXX, XXX = gif, png or jpg)
"; - } - } - } - } - } - // inserting the pictures found in the directory - $root.= "\n".$indent.""; - if ( sizeof( $pictures ) > 0 ) - { - for( $i = 0; $i < sizeof( $pictures ); $i++ ) - { - $query = "insert into $prefixeTable"."images (file,cat_id,date_available,tn_ext,filesize,width,height) values ('".$pictures[$i]['file']."','".$category_id."','".$pictures[$i]['date']."','".$pictures[$i]['tn_ext']."','".$pictures[$i]['filesize']."','".$pictures[$i]['width']."','".$pictures[$i]['height']."');"; - echo" - ".$pictures[$i]['file']." ".$lang['update_research_added']." (".$lang['update_research_tn_ext']." ".$pictures[$i]['tn_ext'].")
"; - $count_new++; - mysql_query( $query ); - } - } - } - - // The function "update_cat_info" updates the information about the last online image - // and the number of images in the category - function update_cat_info( $category_id ) - { - global $prefixeTable; - - $query = "select date_available from $prefixeTable"."images"; - $query.= " where cat_id = $category_id"; - $query.= " order by date_available desc limit 0,1;"; - $result = mysql_query( $query ); - $row = mysql_fetch_array( $result ); - $date_last = $row['date_available']; - - $query = "select count(*) as nb_images from $prefixeTable"."images"; - $query.= " where cat_id = $category_id"; - $result = mysql_query( $query ); - $row = mysql_fetch_array( $result ); - $nb_images = $row['nb_images']; - - $query = "update $prefixeTable"."categories"; - $query.= " set date_dernier = '$date_last'"; - $query.= ", nb_images = $nb_images"; - $query.= " where id = $category_id;"; - mysql_query( $query ); - } - - function getContent( $element, $node ) - { - $content = str_replace( "<".$node.">", "", $element ); - $content = str_replace( "", "", $content ); - return $content; - } - - function getChild( $document, $node ) - { - preg_match("/\<".$node.">.*\<\/".$node."\>/U", $document, $retour); - return $retour[0]; - } - - function getChildren( $document, $node ) - { - preg_match_all("/\<".$node.">.*\<\/".$node."\>/U", $document, $retour); - return $retour[0]; - } - - function remote_images() - { - global $conf, $prefixeTable, $lang; - - // 1.is there a file listing.xml ? - $filename = "listing.xml"; - $xml_content = ""; - if ( $fp = @fopen ( $filename, "r" ) ) - { - while ( !feof ( $fp ) ) - { - $xml_content .= fgets ( $fp, 1024 ); - } - @fclose( $file ); - $xml_content = str_replace("\n","",$xml_content); - $xml_content = str_replace("\t","",$xml_content); - } - else - { - return false; - } - $url = getContent( getChild( $xml_content, "url" ), "url" ); - echo "$url

"; - - // 2. is the site already existing ? - $site_id = ""; - $result = mysql_query( "select id from $prefixeTable"."sites where galleries_url = '$url';" ); - if ( mysql_num_rows($result ) == 0 ) - { - // we have to register this site in the database - mysql_query( "insert into $prefixeTable"."sites (galleries_url) values ('$url');" ); - $site_id = mysql_insert_id(); - } - else - { - // we get the already registered id - $row = mysql_fetch_array( $result ); - $site_id = $row['id']; - } - - // 3. available dirs in the file - insert_remote_category( $xml_content, $site_id, "NULL", 0 ); - } - - // insert_remote_category search the "dir" node of the xml_dir given - // and insert the contained categories if the are not in the database yet. - // The function also delete the categories that are in the database - // and not in the xml_file - function insert_remote_category( $xml_dir, $site_id, $id_uppercat, $level ) - { - global $prefixeTable,$conf;; - - $categories = array(); - $list_dirs = getChildren( $xml_dir, "dir".$level ); - for ( $i = 0; $i < sizeof( $list_dirs ); $i++ ) - { - // is the category already existing ? - $category_id = ""; - $name = getContent( getChild( $list_dirs[$i], "name" ), "name" ); - $categories[$i] = $name; - echo " - $name -
"; - $query = "select id from $prefixeTable"."categories"; - $query.= " where site_id = '$site_id'"; - $query.= " and dir = '$name'"; - if ( $id_uppercat == "NULL" ) - { - $query.= " and id_uppercat is NULL;"; - } - else - { - $query.= " and id_uppercat = '$id_uppercat';"; - } - //echo "
".$query; - $result = mysql_query( $query ); - if ( mysql_num_rows( $result ) == 0 ) - { - // we have to create the category - $query = "insert into $prefixeTable"."categories (dir,site_id,id_uppercat) values ('$name','$site_id'"; - if ( $id_uppercat == "NULL" ) - { - $query.= ",NULL"; - } - else - { - $query.= ",'$id_uppercat'"; - } - $query.= ");"; - //echo "
".$query; - mysql_query( $query ); - $category_id = mysql_insert_id(); - } - else - { - // we get the already registered id - $row = mysql_fetch_array( $result ); - $category_id = $row['id']; - } - insert_remote_image( $list_dirs[$i], $category_id ); - update_cat_info( $category_id ); - insert_remote_category( $list_dirs[$i], $site_id, $category_id, $level + 1 ); - echo " -
"; - } - // we have to remove the categories of the database not present in the xml file - // (ie deleted from the picture storage server) - $query = "select dir,id from $prefixeTable"."categories"; - $query.= " where site_id = '$site_id'"; - if ( $id_uppercat == "NULL" ) - { - $query.= " and id_uppercat is NULL;"; - } - else - { - $query.= " and id_uppercat = '$id_uppercat';"; - } - $result = mysql_query( $query ); - while ( $row = mysql_fetch_array( $result ) ) - { - // is the category in the xml file ? - if ( !in_array( $row['dir'], $categories ) ) - { - delete_category( $row['id'] ); - } - } - } - - // insert_remote_image search the "root" node of the xml_dir given - // and insert the contained pictures if the are not in the database yet - function insert_remote_image( $xml_dir, $category_id ) - { - global $prefixeTable,$count_new,$lang; - - $root = getChild( $xml_dir, "root" ); - $pictures = array(); - $xml_pictures = getChildren( $root, "picture" ); - for ( $j = 0; $j < sizeof( $xml_pictures ); $j++ ) - { - // - // albatros.jpg - // png - // 2002-04-14 - // 35 - // 640 - // 480 - // - $file = getContent( getChild( $xml_pictures[$j], "file" ), "file" ); - $tn_ext = getContent( getChild( $xml_pictures[$j], "tn_ext" ), "tn_ext" ); - $date = getContent( getChild( $xml_pictures[$j], "date" ), "date" ); - $filesize = getContent( getChild( $xml_pictures[$j], "filesize" ), "filesize" ); - $width = getContent( getChild( $xml_pictures[$j], "width" ), "width" ); - $height = getContent( getChild( $xml_pictures[$j], "height" ), "height" ); - - $pictures[$j] = $file; - - // is the picture already existing in the database ? - $query = "select id,tn_ext from $prefixeTable"."images where cat_id = '$category_id' and file = '$file';"; - $result = mysql_query( $query ); - $query = ""; - if ( mysql_num_rows( $result ) == 0 ) - { - $query = "insert into $prefixeTable"."images (file,cat_id,date_available,tn_ext,filesize,width,height) values ('$file','$category_id','$date','$tn_ext','$filesize','$width','$height');"; - echo" - $file ".$lang['update_research_added']." (".$lang['update_research_tn_ext']." $tn_ext)
"; - $count_new++; - } - else - { - // is the tn_ext the same in the xml file and in the database ? - $row = mysql_fetch_array( $result ); - if ( $row['tn_ext'] != $tn_ext ) - { - $query = "update $prefixeTable"."images set tn_ext = '$tn_ext' where cat_id = '$category_id' and file = '$file';"; - } - } - // execution of the query - if ( $query != "" ) - { - mysql_query( $query ); - } - } - // we have to remove the pictures of the database not present in the xml file - // (ie deleted from the picture storage server) - $query = "select id,file from $prefixeTable"."images where cat_id = '$category_id';"; - $result = mysql_query( $query ); - while ( $row = mysql_fetch_array( $result ) ) - { - // is the file in the xml file ? - if ( !in_array( $row['file'], $pictures ) ) - { - delete_image( $row['id'] ); - } - } - } - //------------------------------------------------------------------------------ - echo ""; - //------------------------------------------------------------------------------ - // Display choice if "update" var is not specified - check_cat_id( $HTTP_GET_VARS['update'] ); - if ( !isset( $HTTP_GET_VARS['update'] ) && !( isset( $page['cat'] ) || $HTTP_GET_VARS['update'] == 'cats' || $HTTP_GET_VARS['update'] == 'all' ) ) - { - echo" - - - - "; - } - //------------------------------------------------------------------------------ - // Recherche des nouvelles images dans les repertoires - else - { - $count_new = 0; - $count_deleted = 0; - echo" - - - - "; - } - //------------------------------------------------------------------------------ - // Searching new pictures in the file listing.xml from a remote storage server - if ( @is_file( "./listing.xml" ) ) - { - $count_new = 0; - $count_deleted = 0; - echo" - - - - "; - } - //------------------------------------------------------------------------------ - echo "
".$lang['update_default_title']."
-
- \">\"".$lang['update_only_cat']." -
\">\"".$lang['update_all']." -
-
".$lang['update_part_research']."
-
"; - if ( isset( $page['cat'] ) ) - { - insert_local_category( $page['cat'] ); - } - else - { - insert_local_category( "NULL" ); - } - echo "
$count_new ".$lang['update_research_conclusion'].""; - echo "
$count_deleted ".$lang['update_deletion_conclusion'].""; - echo " -
-
Site distant
-
"; - remote_images(); - echo "
$count_new ".$lang['update_research_conclusion'].""; - echo "
$count_deleted ".$lang['update_deletion_conclusion'].""; - echo " -
-
"; -?> \ No newline at end of file -- cgit v1.2.3