Changeset 228

Timestamp:

Nov 3, 2003, 10:35:24 PM (21 years ago)

Author:

z0rglub

Message:

Modifications linked to the move of admin.php to the root directory of PhpWebGallery

Location:

trunk

Files:

• admin.php (modified) (4 diffs)
• admin/comments.php (modified) (1 diff)
• admin/configuration.php (modified) (1 diff)
• admin/help.php (modified) (1 diff)
• admin/infos_images.php (modified) (1 diff)
• admin/thumbnail.php (modified) (1 diff)
• admin/update.php (modified) (3 diffs)
• category.php (modified) (1 diff)

trunk/admin.php

@@ -19 +19 @@
 
 //----------------------------------------------------------- personnal include
-include_once( './include/isadmin.inc.php' );
+include_once( './admin/include/isadmin.inc.php' );
 //----------------------------------------------------- template initialization
 $vtp = new VTemplate;
-$handle = $vtp->Open( '../template/'.$user['template'].'/admin/admin.vtp' );
+$handle = $vtp->Open( './template/'.$user['template'].'/admin.vtp' );
 // language
 $tpl = array( 'title_default','charset','install_warning' );
@@ -118 +118 @@
      $title.= ' '.$lang['title_thumbnails_2'].' <span style="color:#006699;">';
      // $_GET['dir'] contains :
-     // ../galleries/vieux_lyon ou
-     // ../galleries/vieux_lyon/visite ou
-     // ../galleries/vieux_lyon/visite/truc ...
+     // ./galleries/vieux_lyon ou
+     // ./galleries/vieux_lyon/visite ou
+     // ./galleries/vieux_lyon/visite/truc ...
      $dir = explode( "/", $_GET['dir'] );
      $title.= $dir[2];
@@ -238 +238 @@
 $vtp->addSession( $handle, 'summary' );
 $vtp->setVar( $handle, 'summary.indent', '| ' );
-$vtp->setVar( $handle, 'summary.link', add_session_id( '../category.php' ) );
+$vtp->setVar( $handle, 'summary.link', add_session_id( './category.php' ) );
 $vtp->setVar( $handle, 'summary.name', $lang['menu_back'] );
 $vtp->closeSession( $handle, 'summary' );
@@ -244 +244 @@
 if ( $page_valide )
 {
-  include ( $_GET['page'].'.php' );
+  include ( './admin/'.$_GET['page'].'.php' );
 }
 else

trunk/admin/comments.php

@@ -61 +61 @@
     $vtp->setVar( $sub, 'picture.title', $name );
     // source of the thumbnail picture
-    $src = '';
-    if ( $array_cat_site_id[$subrow['cat_id']] == 1 )
-    {
-      $src.= '.';
-    }
-    $src.= $array_cat_directories[$subrow['cat_id']];
+    $src = $array_cat_directories[$subrow['cat_id']];
     $src.= 'thumbnail/'.$conf['prefix_thumbnail'];
     $src.= $file.'.'.$subrow['tn_ext'];
     $vtp->setVar( $sub, 'picture.thumb_src', $src );
     // link to the full size picture
-    $url = '../picture.php?cat='.$subrow['cat_id'];
+    $url = './picture.php?cat='.$subrow['cat_id'];
     $url.= '&image_id='.$row['image_id'];
     $vtp->setVar( $sub, 'picture.thumb_url', add_session_id( $url ) );

trunk/admin/configuration.php

@@ -590 +590 @@
 $vtp->addSession( $sub, 'select' );
 $vtp->setVar( $sub, 'select.name', 'language' );
-$option = get_languages( '../language/' );
+$option = get_languages( './language/' );
 for ( $i = 0; $i < sizeof( $option ); $i++ )
 {

trunk/admin/help.php

@@ -30 +30 @@
   {
     $vtp->addSession( $sub, 'illustration' );
-    $vtp->setVar( $sub, 'illustration.pic_src', './images/admin.png' );
+    $vtp->setVar( $sub, 'illustration.pic_src', './admin/images/admin.png' );
     $vtp->setVar( $sub, 'illustration.pic_alt', '' );
     $vtp->setVar( $sub, 'illustration.caption', $lang['help_images_intro'] );

trunk/admin/infos_images.php

@@ -273 +273 @@
     }
     $thumbnail_url = $array_cat_directories[$row['storage_category_id']];
-    if ( preg_match( '/^\.\/galleries/', $thumbnail_url ) )
-    {
-      $thumbnail_url = '.'.$thumbnail_url;
-    }
     $thumbnail_url.= 'thumbnail/';
     $thumbnail_url.= $conf['prefix_thumbnail'].$file.".".$row['tn_ext'];

trunk/admin/thumbnail.php

@@ -422 +422 @@
 {
   $vtp->addSession( $sub, 'directory_list' );
-  get_displayed_dirs( '../galleries', 60 );
+  get_displayed_dirs( './galleries', 60 );
   $vtp->closeSession( $sub, 'directory_list' );
 }

trunk/admin/update.php

@@ -23 +23 @@
 {
   global $conf, $page, $user, $lang;
-                
+
   $site_id = 1;
-                
+
   // 0. retrieving informations on the category to display
-  $cat_directory = '../galleries';
-                
+  $cat_directory = './galleries';
+
   if ( is_numeric( $cat_id ) )
   {
@@ -65 +65 @@
   {
     // retrieving the directory
-    $rep = '../galleries/'.get_local_dir( $row['id'] );
+    $rep = './galleries/'.get_local_dir( $row['id'] );
     // is the directory present ?
     if ( !is_dir( $rep ) ) delete_category( $row['id'] );
@@ -589 +589 @@
   $vtp->closeSession( $sub, 'introduction' );
 }
-//------------------------------------------------- local update : ../galleries
+//-------------------------------------------------- local update : ./galleries
 else
 {

trunk/category.php

@@ -217 +217 @@
   $vtp->addSession( $handle, 'summary' );
   $vtp->setVar( $handle, 'summary.url',
-                add_session_id( './admin/admin.php' ) );
+                add_session_id( './admin.php' ) );
   $vtp->setVar( $handle, 'summary.title', $lang['hint_admin'] );
   $vtp->setVar( $handle, 'summary.name', replace_space( $lang['admin'] ) );