Changeset 1029

Timestamp:

Feb 8, 2006, 2:17:07 AM (18 years ago)

Author:

rvelices

Message:

• remake of Remote sites and Synchronize:
  • synchronization for remote and local sites are done by the same code
  • remote sites can update metadata now (not before) - bug 279
  • fixes bug 82: has_high column

• improve feature 280: user sort by filename

• fix path to template mimetypes icons

• bug 284: session cookie lifetime, deletion on logout and corrected issue

when db upgrades were missing

Location:

trunk

Files:

• admin.php (modified) (1 diff)
• admin/include/functions_metadata.php (modified) (2 diffs)
• admin/site_manager.php (added)
• admin/site_reader_local.php (added)
• admin/site_reader_remote.php (added)
• admin/site_update.php (added)
• admin/update.php (modified) (1 diff)
• category.php (modified) (1 diff)
• identification.php (modified) (1 diff)
• include/common.inc.php (modified) (1 diff)
• include/functions.inc.php (modified) (1 diff)
• include/functions_category.inc.php (modified) (1 diff)
• include/functions_session.inc.php (modified) (1 diff)
• language/en_UK.iso-8859-1/common.lang.php (modified) (1 diff)
• language/fr_FR.iso-8859-1/common.lang.php (modified) (1 diff)
• picture.php (modified) (2 diffs)
• template/yoga/admin.tpl (modified) (2 diffs)
• template/yoga/admin/site_manager.tpl (added)
• template/yoga/admin/site_update.tpl (added)
• template/yoga/theme/clear/themeconf.inc.php (modified) (1 diff)
• template/yoga/theme/dark/themeconf.inc.php (modified) (1 diff)
• tools/create_listing_file.php (modified) (5 diffs)

trunk/admin.php

@@ -66 +66 @@
 $template->assign_vars(
   array(
+    'U_SITE_MANAGER'=> $link_start.'site_manager',
     'U_HISTORY'=> $link_start.'stats',
     'U_FAQ'=> $link_start.'help',

trunk/admin/include/functions_metadata.php

@@ -176 +176 @@
  *
  * @param int id_uppercat
+ * @param int site_id
  * @param boolean recursive ?
  * @param boolean only newly added files ?
  * @return array
  */
-function get_filelist($category_id = '', $recursive = false, $only_new = false)
+function get_filelist($category_id = '', $site_id=1, $recursive = false, 
+                      $only_new = false)
 {
   // filling $cat_ids : all categories required
@@ -188 +190 @@
 SELECT id
   FROM '.CATEGORIES_TABLE.'
-  WHERE site_id = 1
+  WHERE site_id = '.$site_id.'
     AND dir IS NOT NULL';
   if (is_numeric($category_id))

trunk/admin/update.php

@@ -744 +744 @@
   }
   $start = get_moment();
-  $files = get_filelist($opts['category_id'],
+  $files = get_filelist($opts['category_id'], 1,
                         $opts['recursive'],
                         $opts['only_new']);

trunk/category.php

@@ -38 +38 @@
   session_unset();
   session_destroy();
-  setcookie(session_name(),'',0,'/');
+  setcookie(session_name(),'',0, cookie_path() );
   $url = 'category.php';
   redirect( $url );

trunk/identification.php

@@ -52 +52 @@
       $session_length = $conf['remember_me_length'];
     }
+    session_set_cookie_params($session_length);
     session_start();
     $_SESSION['id'] = $row['id'];

trunk/include/common.inc.php

@@ -148 +148 @@
   if (count(array_diff($existing, $applied)) > 0)
   {
+    ob_start();// buffer output so that cookies work
     echo
       '<p>'

trunk/include/functions.inc.php

@@ -975 +975 @@
 
 /**
+ * returns the $str in current language if possible or $str enclosed 
+ * in special chars
+ */
+function get_lang($str)
+{
+  global $lang;
+  if ( isset($lang[$str]) )
+  {
+    return $lang[$str];
+  }
+  return '@@'.$str.'@@';
+}
+
+/**
  * which upgrades are available ?
  *

trunk/include/functions_category.inc.php

@@ -322 +322 @@
 function get_category_preferred_image_orders()
 {
-  global $lang, $conf;
+  global $conf;
   return array(
         array('Default', '', true),
-        array($lang['best_rated_cat'],   'average_rate DESC', $conf['rate']),
-        array($lang['most_visited_cat'], 'hit DESC', true),
-        array($lang['Creation date'], 'date_creation DESC', true),
-        array($lang['Availability date'], 'date_available DESC', true)
+        array(get_lang('best_rated_cat'),   'average_rate DESC', $conf['rate']),
+        array(get_lang('most_visited_cat'), 'hit DESC', true),
+        array(get_lang('Creation date'), 'date_creation DESC', true),
+        array(get_lang('Availability date'), 'date_available DESC', true),
+        array(get_lang('File name'), 'file ASC', true)
   );
 }

trunk/include/functions_session.inc.php

@@ -70 +70 @@
   ini_set('session.use_trans_sid', intval($conf['session_use_trans_sid']));
   ini_set('session.name', $conf['session_name']);
-  ini_set('session.cookie_path', dirname($_SERVER['PHP_SELF']));
+  ini_set('session.cookie_path', cookie_path() );
+}
+
+// cookie_path returns the path to use for the PhpWebGallery cookie.
+// If PhpWebGallery is installed on :
+// http://domain.org/meeting/gallery/category.php
+// cookie_path will return : "/meeting/gallery"
+function cookie_path()
+{
+  if ( isset($_SERVER['REDIRECT_URL']) )
+  { // mod_rewrite is activated for upper level directories. we must set the 
+    // cookie to the path shown in the browser otherwise it will be discarded.
+    $scr = $_SERVER['REDIRECT_URL'];
+  }
+  else
+  {
+    $scr = $_SERVER['PHP_SELF'];
+  }
+  return substr($scr,0,strrpos( $scr,'/'));
 }
 

trunk/language/en_UK.iso-8859-1/common.lang.php

@@ -65 +65 @@
 $lang['Error sending email'] = 'Error sending email';
 $lang['File'] = 'File';
+$lang['File name'] = 'File name';
 $lang['Filesize'] = 'Filesize';
 $lang['Filter and display'] = 'Filter and display';

trunk/language/fr_FR.iso-8859-1/common.lang.php

@@ -64 +64 @@
 $lang['Error sending email'] = 'Erreur à l\'envoi du mail';
 $lang['File'] = 'Fichier';
+$lang['File name'] = 'Nom du fichier';
 $lang['Filesize'] = 'Poids';
 $lang['Filter and display'] = 'Filtrer et afficher';

trunk/picture.php

@@ -250 +250 @@
     if ($i == 'current')
     {
-      $url_high=$cat_directory.'/pwg_high/'.$row['file'];
-      if (url_is_remote($cat_directory))
+      if ($row['has_high']=='true')
       {
-        if ($row['has_high'])
-        {
-          $picture[$i]['high'] = $url_high;
-        }
-      }
-      else
-      {
-        if (@fopen($url_high, 'r'))
-        {
-          $picture[$i]['high'] = $url_high;
-        }
+        $url_high=$cat_directory.'/pwg_high/'.$row['file'];
+        $picture[$i]['high'] = $url_high;
       }
     }
@@ -1055 +1045 @@
   // navigation bar creation
   $url = PHPWG_ROOT_PATH.'picture.php';
-  $url.= get_query_string_diff(array('rate','add_fav'));
+  $url.= get_query_string_diff(array('rate','add_fav','start'));
 
   if (!isset( $_GET['start'] )

trunk/template/yoga/admin.tpl

@@ -15 +15 @@
       <ul>
         <li><a href="{U_FAQ}">{lang:instructions}</a></li>
+        <li><a href="{U_SITE_MANAGER}">{lang:Site manager}</a></li>
         <li><a href="{U_SITES}">{lang:remote_sites}</a></li>
         <li><a href="{U_HISTORY}">{lang:history}</a></li>
@@ -68 +69 @@
 <div id="content">
   <!-- BEGIN errors -->
-  <div id="errors">
+  <div class="errors">
     <ul>
       <!-- BEGIN error -->

trunk/template/yoga/theme/clear/themeconf.inc.php

@@ -5 +5 @@
   'icon_dir' => PHPWG_ROOT_PATH.'template/yoga/icon',
   'admin_icon_dir' => PHPWG_ROOT_PATH.'template/yoga/icon/admin',
-  'mime_icon_dir' => PHPWG_ROOT_PATH.'template/yoga/icon/mymetypes'
+  'mime_icon_dir' => PHPWG_ROOT_PATH.'template/yoga/icon/mimetypes/'
 );
 ?>

trunk/template/yoga/theme/dark/themeconf.inc.php

@@ -5 +5 @@
   'icon_dir' => PHPWG_ROOT_PATH.'template/yoga/icon',
   'admin_icon_dir' => PHPWG_ROOT_PATH.'template/yoga/icon/admin',
-  'mime_icon_dir' => PHPWG_ROOT_PATH.'template/yoga/icon/mymetypes'
+  'mime_icon_dir' => PHPWG_ROOT_PATH.'template/yoga/icon/mimetypes/'
 );
 ?>

trunk/tools/create_listing_file.php

@@ -45 +45 @@
 $conf['version'] = '%PWGVERSION%';
 
-// $conf['use_exif'] set to true if you want to use Exif Date as "creation
-// date" for the element, otherwise, set to false
+// $conf['use_exif'] set to true if you want to use Exif information
 $conf['use_exif'] = true;
+
+// use_exif_mapping: same behaviour as use_iptc_mapping
+$conf['use_exif_mapping'] = array(
+  'date_creation' => 'DateTimeOriginal'
+  );
 
 // $conf['use_iptc'] set to true if you want to use IPTC informations of the
@@ -321 +325 @@
       if ($file != '.'
           and $file != '..'
+          and $file != '.svn'
           and $file != 'thumbnail'
           and $file != 'pwg_high'
@@ -345 +350 @@
     $dirs.= "\n".$indent.'</dir'.$level.'>';
   }
-  return $dirs;         
+  return $dirs;   
 }
 
@@ -426 +431 @@
           if ($exif = @read_exif_data($dir.'/'.$fs_file))
           {
-            if (isset($exif['DateTime']))
+            foreach ($conf['use_exif_mapping'] as $pwg_key => $exif_key )
             {
-              preg_match('/^(\d{4}):(\d{2}):(\d{2})/'
-                         ,$exif['DateTime']
-                         ,$matches);
-              $element['date_creation'] =
-                $matches[1].'-'.$matches[2].'-'.$matches[3];
+              if (isset($exif[$exif_key]))
+              {
+                if ( in_array($pwg_key, array('date_creation','date_available') ) )
+                {
+                   if (preg_match('/^(\d{4}):(\d{2}):(\d{2})/'
+                         ,$exif[$exif_key]
+                         ,$matches))
+                   {
+                     $element[$pwg_key] =
+                        $matches[1].'-'.$matches[2].'-'.$matches[3];
+                   }
+                }
+                else
+                {
+                  $element[$pwg_key] = $exif[$exif_key];
+                }
+              }
             }
           }
@@ -525 +542 @@
     $listing.= ' generation_date="'.date('Y-m-d').'"';
     $listing.= ' phpwg_version="'.$conf{'version'}.'"';
+    
+    $attrs=array();
+    if ($conf['use_iptc'])
+    {
+      $attrs = array_merge($attrs, array_keys($conf['use_iptc_mapping']) );
+    }
+    if ($conf['use_exif'])
+    {
+      $attrs = array_merge($attrs, array_keys($conf['use_exif_mapping']) );
+    }
+    $listing.= ' metadata="'.implode(',',array_unique($attrs)).'"';
     
     $end = strrpos($_SERVER['PHP_SELF'], '/') + 1;