Changeset 394 for trunk/include

Timestamp:

Mar 26, 2004, 6:08:09 PM (21 years ago)

Author:

gweltas

Message:

• Template migration
• Admin Control Panel migration
• Category management

Location:

trunk/include

Files:

• common.inc.php (modified) (3 diffs)
• functions.inc.php (modified) (2 diffs)
• functions_category.inc.php (modified) (6 diffs)
• functions_user.inc.php (modified) (1 diff)
• htmlfunctions.inc.php (added)

trunk/include/common.inc.php

@@ -121 +121 @@
 }
 
-define( 'PREFIX_INCLUDE', '' );// en attendant la migration complète
 include(PHPWG_ROOT_PATH . 'include/constants.php');
 include(PHPWG_ROOT_PATH . 'include/config.inc.php');
@@ -141 +140 @@
 if ( getenv( 'HTTP_X_FORWARDED_FOR' ) != '' )
 {
-  $client_ip = ( !empty($_SERVER['REMOTE_ADDR']) ) ? $_SERVER['REMOTE_ADDR'] : ( ( !empty($_ENV['REMOTE_ADDR']) ) ? $_ENV['REMOTE_ADDR'] : $REMOTE_ADDR );
+  $client_ip = ( !empty($_SERVER['REMOTE_ADDR']) ) ? 
+    $_SERVER['REMOTE_ADDR'] : ( ( !empty($_ENV['REMOTE_ADDR']) ) ? $_ENV['REMOTE_ADDR'] : $REMOTE_ADDR );
 
   if ( preg_match("/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/",
@@ -159 +159 @@
 else
 {
-  $client_ip = ( !empty($_SERVER['REMOTE_ADDR']) ) ? $_SERVER['REMOTE_ADDR'] : ( ( !empty($_ENV['REMOTE_ADDR']) ) ? $_ENV['REMOTE_ADDR'] : $REMOTE_ADDR );
+  $client_ip = ( !empty($_SERVER['REMOTE_ADDR']) ) ? 
+    $_SERVER['REMOTE_ADDR'] : ( ( !empty($_ENV['REMOTE_ADDR']) ) ? $_ENV['REMOTE_ADDR'] : $REMOTE_ADDR );
 }
 $user_ip = encode_ip($client_ip);
 
 //
-// Setup forum wide options, if this fails then we output a CRITICAL_ERROR
-// since basic forum information is not available
+// Setup gallery wide options, if this fails then we output a CRITICAL_ERROR
+// since basic gallery information is not available
 //
 $query = 'SELECT param,value';

trunk/include/functions.inc.php

@@ -25 +25 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
-include( PHPWG_ROOT_PATH .'include/functions_user.inc.php' );
-include( PHPWG_ROOT_PATH .'include/functions_session.inc.php' );
-include( PHPWG_ROOT_PATH .'include/functions_category.inc.php' );
-include( PHPWG_ROOT_PATH .'include/functions_xml.inc.php' );
-include( PHPWG_ROOT_PATH .'include/functions_group.inc.php' );
+include_once( PHPWG_ROOT_PATH .'include/functions_user.inc.php' );
+include_once( PHPWG_ROOT_PATH .'include/functions_session.inc.php' );
+include_once( PHPWG_ROOT_PATH .'include/functions_category.inc.php' );
+include_once( PHPWG_ROOT_PATH .'include/functions_xml.inc.php' );
+include_once( PHPWG_ROOT_PATH .'include/functions_group.inc.php' );
+include_once( PHPWG_ROOT_PATH .'include/htmlfunctions.inc.php' );
 
 //----------------------------------------------------------- generic functions
@@ -397 +398 @@
   {
     $to = $row['mail_address'];
-    include( PREFIX_INCLUDE.'./language/'.$row['language'].'.php' );
+    include( PHPWG_ROOT_PATH.'language/'.$row['language'].'.php' );
     $content = $lang['mail_hello']."\n\n";
     switch ( $type )

trunk/include/functions_category.inc.php

@@ -112 +112 @@
     $category = array();
     foreach ( $infos as $info ) {
-      if ( $info == 'uc.date_last' )
-      {
-        list($year,$month,$day) = explode( '-', $row['date_last'] );
-        $category['date_last'] = mktime(0,0,0,$month,$day,$year);
+      if ( $info == 'uc.date_last')
+      {
+            if (empty($row['date_last'])) 
+                {
+                  $category['date_last']= 0;
+                }
+                else
+                {
+          list($year,$month,$day) = explode( '-', $row['date_last'] );
+          $category['date_last'] = mktime(0,0,0,$month,$day,$year);
+                }
       }
       else if ( isset( $row[$info] ) ) $category[$info] = $row[$info];
@@ -240 +247 @@
 function get_cat_info( $id )
 {
-  global $page;
-
   $infos = array( 'nb_images','id_uppercat','comment','site_id','galleries_url'
                   ,'dir','date_last','uploadable','status','visible'
@@ -271 +276 @@
   $cat['name'] = array();
 
-  $query = 'SELECT name FROM '.CATEGORIES_TABLE;
+  $query = 'SELECT name,id FROM '.CATEGORIES_TABLE;
   $query.= ' WHERE id IN ('.$cat['uppercats'].')';
   $query.= ' ORDER BY id ASC';
@@ -278 +283 @@
   while( $row = mysql_fetch_array( $result ) )
   {
-    array_push( $cat['name'], $row['name'] );
+    $cat['name'][$row['id']] = $row['name'];
   }
   
@@ -349 +354 @@
   $row = mysql_fetch_array( mysql_query( $query ) );
   return $row['galleries_url'];
-}
-
-// The function get_cat_display_name returns a string containing the list
-// of upper categories to the root category from the lowest category shown
-// example : "anniversaires - fete mere 2002 - animaux - erika"
-// You can give two parameters :
-//   - $separation : the string between each category name " - " for example
-//   - $style : the style of the span tag for the lowest category,
-//     "font-style:italic;" for example
-function get_cat_display_name( $array_cat_names, $separation,
-                               $style, $replace_space = true )
-{
-  $output = '';
-  foreach ( $array_cat_names as $i => $name ) {
-    if ( $i > 0 ) $output.= $separation;
-    if ( $i < count( $array_cat_names ) - 1 or $style == '')
-      $output.= $name;
-    else
-      $output.= '<span style="'.$style.'">'.$name.'</span>';
-  }
-  if ( $replace_space ) return replace_space( $output );
-  else                  return $output;
 }
 
@@ -634 +617 @@
 }
 ?>
+

trunk/include/functions_user.inc.php

@@ -261 +261 @@
   $template_path = 'template/' ;
   $template_name = $style ;
-  include_once( PHPWG_ROOT_PATH . $template_path . $template_name.'/htmlfunctions.inc.php' );
   $template = new Template(PHPWG_ROOT_PATH . $template_path . $template_name);
   return $template;