diff --git a/about.php b/about.php index 7e13d604c..03520020a 100644 --- a/about.php +++ b/about.php @@ -39,7 +39,7 @@ $template->set_filenames(array('about'=>'about.tpl')); $template->assign_vars(array( 'PAGE_TITLE' => $title, 'L_ABOUT' => $lang['about_message'], - 'L_RETURN' => $lang['about_return'], + 'L_RETURN' => $lang['return_main_page'], 'U_RETURN' => add_session_id(PHPWG_ROOT_PATH.'category.php?'.$_SERVER['QUERY_STRING']) ) ); diff --git a/admin.php b/admin.php index 509031bde..f302dab33 100644 --- a/admin.php +++ b/admin.php @@ -42,27 +42,9 @@ switch ( $_GET['page'] ) case 'user_modify': $title = $lang['title_modify']; $page_valide = true; break; case 'user_search': - /* if ( !is_numeric( $_GET['user_id'] ) ) $_GET['user_id'] = -1; - $query = 'SELECT status,username'; - $query.= ' FROM '.USERS_TABLE; - $query.= ' WHERE id = '.$_GET['user_id']; - $query.= ';'; - $result = mysql_query( $query ); - if ( mysql_num_rows( $result ) > 0 ) - { - $row = mysql_fetch_array( $result ); - $page['user_status'] = $row['status']; - if ( $row['username'] == 'guest' ) $row['username'] = $lang['guest']; - $page['user_username'] = $row['username']; - $page_valide = true; - $title = $lang['title_user_perm'].' "'.$page['user_username'].'"'; - } - else - { - $page_valide = false; - }*/ - $title = $lang['title_user_perm']; - //.' '.$_POST['username']; + $username=''; + if (isset($_POST['username'])) $username=$_POST['username']; + $title = $lang['title_user_perm'].' '.$username; $page_valide = true; break; case 'group_list' : $title = $lang['title_groups']; $page_valide = true; break; diff --git a/admin/images/monthly_visits.img.php b/admin/images/global_stats.img.php similarity index 100% rename from admin/images/monthly_visits.img.php rename to admin/images/global_stats.img.php diff --git a/admin/stats.php b/admin/stats.php index c98c38968..d06ad5dc0 100644 --- a/admin/stats.php +++ b/admin/stats.php @@ -30,14 +30,14 @@ if( !defined("PHPWG_ROOT_PATH") ) } include_once( PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php' ); -$url_img_monthly_report = PHPWG_ROOT_PATH.'/admin/images/monthly_visits.img.php'; +$url_img_global_report = PHPWG_ROOT_PATH.'admin/images/global_stats.img.php'; //----------------------------------------------------- template initialization $template->set_filenames( array('stats'=>'admin/stats.tpl') ); $template->assign_vars(array( 'L_STAT_TITLE'=>$lang['stats_last_days'], 'L_STAT_MONTHLY_ALT'=>$lang['stats_pages_seen_graph_title'], - 'IMG_MONTHLY_REPORT'=>add_session_id($url_img_monthly_report) + 'IMG_MONTHLY_REPORT'=>add_session_id($url_img_global_report) )); //---------------------------------------------------------------- log history diff --git a/admin/user_search.php b/admin/user_search.php index 2fd21d9c4..9c8189443 100644 --- a/admin/user_search.php +++ b/admin/user_search.php @@ -64,11 +64,9 @@ if ( isset( $_POST['submit'] ) ) } } check_favorites( $_GET['user_id'] ); - synchronize_user( $_GET['user_id'] ); } $user_id = (!empty($userdata['id']))?$userdata['id']:''; - $template->set_filenames( array('user'=>'admin/user_perm.tpl') ); $template->assign_vars(array( 'L_SELECT_USERNAME'=>$lang['Select_username'], @@ -76,8 +74,8 @@ $template->assign_vars(array( 'L_FIND_USERNAME'=>$lang['Find_username'], 'L_AUTH_USER'=>$lang['permuser_only_private'], 'L_SUBMIT'=>$lang['submit'], - 'L_AUTHORIZED'=>$lang['permuser_authorized'], - 'L_FORBIDDEN'=>$lang['permuser_forbidden'], + 'L_AUTHORIZED'=>$lang['authorized'], + 'L_FORBIDDEN'=>$lang['forbidden'], 'L_PARENT_FORBIDDEN'=>$lang['permuser_parent_forbidden'], 'F_SEARCH_USER_ACTION' => add_session_id(PHPWG_ROOT_PATH.'admin.php?page=user_search'), diff --git a/include/script.js b/include/scripts.js similarity index 84% rename from include/script.js rename to include/scripts.js index 7821299c6..43fb86644 100644 --- a/include/script.js +++ b/include/scripts.js @@ -26,3 +26,7 @@ for( i=0; i \ No newline at end of file diff --git a/language/fr_FR.iso-8859-1/common.lang.php b/language/fr_FR.iso-8859-1/common.lang.php index 960338f46..4f45c2356 100644 --- a/language/fr_FR.iso-8859-1/common.lang.php +++ b/language/fr_FR.iso-8859-1/common.lang.php @@ -33,7 +33,7 @@ $lang_info['direction'] = 'ltr'; $lang_info['code'] = 'fr'; // Main words -$lang['gallery_index'] = 'Racine de la galerie'; +$lang['gallery_index'] = 'Accueil'; $lang['category'] = 'Catégorie'; $lang['categories'] = 'Catégories'; $lang['thumbnail'] = 'Miniature'; @@ -199,7 +199,6 @@ $lang['ident_guest_visit'] = 'Parcourir la galerie en tant que visiteur'; $lang['previous_image'] = 'Précédent'; $lang['next_image'] = 'Suivant'; -$lang['back'] = 'Cliquez sur l\'image pour revenir à la page des miniatures'; $lang['info_image_title'] = 'Informations'; $lang['link_info_image'] = 'Modifier les informations de cette image'; $lang['true_size'] = 'Taille réelle'; @@ -312,4 +311,5 @@ $lang['never_rated'] = 'Vous n\'avez jamais vot $lang['no_rate'] = 'Aucun vote'; $lang['rates'] = 'Votes'; $lang['standard_deviation'] = 'STD'; +$lang['picture_high'] = 'Cliquez sur l\'image pour la voir en haute résolution'; ?> \ No newline at end of file diff --git a/picture.php b/picture.php index ec476eefb..e55fde22f 100644 --- a/picture.php +++ b/picture.php @@ -450,12 +450,11 @@ $template->assign_vars(array( 'WIDTH_IMG' => $picture_size[0], 'HEIGHT_IMG' => $picture_size[1], + 'L_HOME' => $lang['gallery_index'], 'L_SLIDESHOW' => $lang['slideshow'], - 'L_TIME' => $lang['period_seconds'], 'L_STOP_SLIDESHOW' => $lang['slideshow_stop'], 'L_PREV_IMG' =>$lang['previous_image'].' : ', 'L_ADMIN' =>$lang['link_info_image'], - 'L_BACK' =>$lang['back'], 'L_COMMENT_TITLE' =>$lang['comments_title'], 'L_ADD_COMMENT' =>$lang['comments_add'], 'L_DELETE_COMMENT' =>$lang['comments_del'], @@ -467,7 +466,6 @@ $template->assign_vars(array( 'L_DOWNLOAD_HINT' => $lang['download_hint'], 'L_PICTURE_METADATA' => $lang['picture_show_metadata'], 'L_PICTURE_HIGH' => $lang['picture_high'], - 'L_PICTURE_HIGH_ALT' => $lang['picture_high_alt'], 'U_HOME' => add_session_id($url_home), 'U_METADATA' => add_session_id($url_metadata), @@ -493,9 +491,16 @@ else // display a high quality link if present if (isset($picture['current']['high'])) { - $template->assign_block_vars( - 'high', - array('U_HIGH' => $picture['current']['high'])); + $full_size = @getimagesize($picture['current']['high']); + $full_width = $full_size[0]; + $full_height = $full_size[1]; + $uuid = uniqid(rand()); + $template->assign_block_vars('high', array( + 'U_HIGH' => $picture['current']['high'], + 'UUID'=>$uuid, + 'WIDTH_IMG'=>($full_width + 16), + 'HEIGHT_IMG'=>($full_height + 16) + )); } //------------------------------------------------------- favorite manipulation if ( !$user['is_the_guest'] ) diff --git a/template/default/admin/user_perm.tpl b/template/default/admin/user_perm.tpl index bd5bb43d2..c55c85446 100644 --- a/template/default/admin/user_perm.tpl +++ b/template/default/admin/user_perm.tpl @@ -8,11 +8,11 @@ -
{L_AUTH_USER}
+
{L_AUTH_USER} {USERNAME}