- Change of the picture page behavior to be able to open the full size image in a new window

- Minor modification for template migration
- Rename of script.js in scripts.js


git-svn-id: http://piwigo.org/svn/trunk@539 68402e56-0260-453c-a942-63ccdbb3a9ee

4 files changed, 7 insertions, 27 deletions

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
index 21a89ef8f..21a89ef8f 100644
--- a/admin/images/monthly_visits.img.php
+++ b/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'),