aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--include/common.inc.php2
-rw-r--r--include/constants.php6
-rw-r--r--include/functions.inc.php10
-rw-r--r--include/functions_xml.inc.php4
-rw-r--r--include/page_tail.php17
-rw-r--r--include/user.inc.php2
6 files changed, 22 insertions, 19 deletions
diff --git a/include/common.inc.php b/include/common.inc.php
index 27b74ae5a..9c3e84cde 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -119,7 +119,7 @@ if( !defined("PHPWG_INSTALLED") )
exit;
}
-
+define( 'PREFIX_INCLUDE', '' );// en attendant la migration complète
include(PHPWG_ROOT_PATH . 'include/constants.php');
include(PHPWG_ROOT_PATH . 'include/config.inc.php');
include(PHPWG_ROOT_PATH . 'include/functions.inc.php');
diff --git a/include/constants.php b/include/constants.php
index b2c75a895..473bacfdc 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -25,8 +25,6 @@
// | USA. |
// +-----------------------------------------------------------------------+
-define( 'PREFIX_INCLUDE', '' );
-
// Debug Level
define('DEBUG', 1); // Debugging on
//define('DEBUG', 0); // Debugging off
@@ -37,10 +35,6 @@ define('GENERAL_ERROR', 202);
define('CRITICAL_MESSAGE', 203);
define('CRITICAL_ERROR', 204);
-// xml tags
-define( 'ATT_REG', '\w+' );
-define( 'VAL_REG', '[^"]*' );
-
// Table names
define('CATEGORIES_TABLE', $table_prefix.'categories');
define('COMMENTS_TABLE', $table_prefix.'comments');
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 55a4426d7..5287bf99e 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -24,11 +24,11 @@
// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
// | USA. |
// +-----------------------------------------------------------------------+
-include( PREFIX_INCLUDE.'./include/functions_user.inc.php' );
-include( PREFIX_INCLUDE.'./include/functions_session.inc.php' );
-include( PREFIX_INCLUDE.'./include/functions_category.inc.php' );
-include( PREFIX_INCLUDE.'./include/functions_xml.inc.php' );
-include( PREFIX_INCLUDE.'./include/functions_group.inc.php' );
+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' );
//----------------------------------------------------------- generic functions
diff --git a/include/functions_xml.inc.php b/include/functions_xml.inc.php
index a8ce44413..de21dc61f 100644
--- a/include/functions_xml.inc.php
+++ b/include/functions_xml.inc.php
@@ -24,6 +24,10 @@
// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
// | USA. |
// +-----------------------------------------------------------------------+
+// xml tags
+define( 'ATT_REG', '\w+' );
+define( 'VAL_REG', '[^"]*' );
+
//------------------------------------------------------------------- functions
// getContent returns the content of a tag
//
diff --git a/include/page_tail.php b/include/page_tail.php
index cc6b04f03..ac4df0a78 100644
--- a/include/page_tail.php
+++ b/include/page_tail.php
@@ -31,12 +31,17 @@ $template->set_filenames(array('tail'=>'footer.tpl'));
$time = get_elapsed_time( $t2, get_moment() );
$template->assign_vars(array(
- 'L_GEN_TIME' => $lang['generation_time'],
- 'S_TIME' => $time,
- 'S_VERSION' => $conf['version'],
- 'U_SITE' => add_session_id( $conf['site_url'] )
- )
- );
+ 'TIME' => $time,
+ 'VERSION' => $conf['version'],
+ 'WEBMASTER'=>$conf['webmaster'],
+ 'MAIL'=>$conf['mail_webmaster'],
+
+ 'L_GEN_TIME' => $lang['generation_time'],
+ 'L_SEND_MAIL' => $lang['send_mail'],
+ 'L_TITLE_MAIL' => $lang['title_send_mail'],
+
+ 'U_SITE' => add_session_id( $conf['site_url'] )
+ ));
if (DEBUG)
{
diff --git a/include/user.inc.php b/include/user.inc.php
index c86ce93fc..880e419d4 100644
--- a/include/user.inc.php
+++ b/include/user.inc.php
@@ -129,6 +129,6 @@ if ($user['status'] == 'admin') $isadmin =true;
// calculation of the number of picture to display per page
$user['nb_image_page'] = $user['nb_image_line'] * $user['nb_line_page'];
init_userprefs($user);
-$user['lien_expanded']='./template/'.$user['template'].'/theme/expanded..gif';
+$user['lien_expanded']='./template/'.$user['template'].'/theme/expanded.gif';
$user['lien_collapsed']='./template/'.$user['template'].'/theme/collapsed.gif';
?>