RELEASE 0.9.4b
This commit is contained in:
parent
4ddc73d883
commit
b9bfda2fd3
@ -1,6 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
// $Header: /cvsroot/phpldapadmin/phpldapadmin/common.php,v 1.48 2004/04/20 13:29:58 uugdave Exp $
|
// $Header: /cvsroot/phpldapadmin/phpldapadmin/common.php,v 1.49 2004/05/10 12:28:07 uugdave Exp $
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* common.php
|
* common.php
|
||||||
@ -26,7 +25,7 @@ error_reporting( E_ALL );
|
|||||||
ob_start();
|
ob_start();
|
||||||
if( ! file_exists( realpath( './functions.php' ) ) ) {
|
if( ! file_exists( realpath( './functions.php' ) ) ) {
|
||||||
ob_end_clean();
|
ob_end_clean();
|
||||||
die( "Fatal error: Required file 'functions.php' dor oes not exist." );
|
die( "Fatal error: Required file 'functions.php' does not exist." );
|
||||||
}
|
}
|
||||||
if( ! is_readable( realpath( './functions.php' ) ) ) {
|
if( ! is_readable( realpath( './functions.php' ) ) ) {
|
||||||
ob_end_clean();
|
ob_end_clean();
|
||||||
@ -43,7 +42,6 @@ set_error_handler( 'pla_error_handler' );
|
|||||||
// based on the user-configured language.
|
// based on the user-configured language.
|
||||||
$lang = array();
|
$lang = array();
|
||||||
|
|
||||||
|
|
||||||
// config.php might not exist (if the user hasn't configured PLA yet)
|
// config.php might not exist (if the user hasn't configured PLA yet)
|
||||||
// Only include it if it does exist.
|
// Only include it if it does exist.
|
||||||
if( file_exists( realpath( './config.php' ) ) ) {
|
if( file_exists( realpath( './config.php' ) ) ) {
|
||||||
@ -71,7 +69,7 @@ foreach( $required_files as $file_name ) {
|
|||||||
file_exists( realpath( $file_name ) )
|
file_exists( realpath( $file_name ) )
|
||||||
or pla_error( "Fatal error: Required file '$file_name' does not exist." );
|
or pla_error( "Fatal error: Required file '$file_name' does not exist." );
|
||||||
is_readable( realpath( $file_name ) )
|
is_readable( realpath( $file_name ) )
|
||||||
or pla_error( "Cannot read the file '$file_name' its permissions are too strict." );
|
or pla_error( "Fatal error: Cannot read the file '$file_name', its permissions are too strict." );
|
||||||
ob_start();
|
ob_start();
|
||||||
require_once realpath( $file_name );
|
require_once realpath( $file_name );
|
||||||
ob_end_clean();
|
ob_end_clean();
|
||||||
@ -141,6 +139,7 @@ if ( get_magic_quotes_gpc() && ( ! isset( $slashes_stripped ) || ! $slashes_stri
|
|||||||
array_stripslashes($_GET);
|
array_stripslashes($_GET);
|
||||||
array_stripslashes($_POST);
|
array_stripslashes($_POST);
|
||||||
array_stripslashes($_COOKIE);
|
array_stripslashes($_COOKIE);
|
||||||
|
array_stripslashes($_FILES);
|
||||||
$slashes_stripped = true;
|
$slashes_stripped = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
10
create.php
10
create.php
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
// $Header: /cvsroot/phpldapadmin/phpldapadmin/create.php,v 1.20 2004/04/11 21:45:47 uugdave Exp $
|
// $Header: /cvsroot/phpldapadmin/phpldapadmin/create.php,v 1.21 2004/05/11 12:23:08 uugdave Exp $
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -43,9 +43,8 @@ if( isset( $required_attrs ) && is_array( $required_attrs ) ) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if( isset( $vals ) && is_array( $vals ) ) {
|
if( isset( $attrs ) && is_array( $attrs ) ) {
|
||||||
foreach( $vals as $i => $val ) {
|
foreach( $attrs as $i => $attr ) {
|
||||||
$attr = $attrs[$i];
|
|
||||||
if( is_attr_binary( $server_id, $attr ) ) {
|
if( is_attr_binary( $server_id, $attr ) ) {
|
||||||
if( isset( $_FILES['vals']['name'][$i] ) && $_FILES['vals']['name'][$i] != '' ) {
|
if( isset( $_FILES['vals']['name'][$i] ) && $_FILES['vals']['name'][$i] != '' ) {
|
||||||
// read in the data from the file
|
// read in the data from the file
|
||||||
@ -57,6 +56,7 @@ if( isset( $vals ) && is_array( $vals ) ) {
|
|||||||
$new_entry[ $attr ][] = $val;
|
$new_entry[ $attr ][] = $val;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
$val = isset( $vals[$i] ) ? $vals[$i] : '';
|
||||||
if( '' !== trim($val) )
|
if( '' !== trim($val) )
|
||||||
$new_entry[ $attr ][] = $val;
|
$new_entry[ $attr ][] = $val;
|
||||||
}
|
}
|
||||||
@ -67,8 +67,6 @@ $new_entry['objectClass'] = $object_classes;
|
|||||||
if( ! in_array( 'top', $new_entry['objectClass'] ) )
|
if( ! in_array( 'top', $new_entry['objectClass'] ) )
|
||||||
$new_entry['objectClass'][] = 'top';
|
$new_entry['objectClass'][] = 'top';
|
||||||
|
|
||||||
// UTF-8 magic. Must decode the values that have been passed to us
|
|
||||||
// REMOVED ALL UTF8 Functions
|
|
||||||
foreach( $new_entry as $attr => $vals )
|
foreach( $new_entry as $attr => $vals )
|
||||||
if( ! is_attr_binary( $server_id, $attr ) )
|
if( ! is_attr_binary( $server_id, $attr ) )
|
||||||
if( is_array( $vals ) )
|
if( is_array( $vals ) )
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
$Header: /cvsroot/phpldapadmin/phpldapadmin/doc/CREDITS,v 1.13 2004/05/06 20:04:26 i18phpldapadmin Exp $
|
$Header: /cvsroot/phpldapadmin/phpldapadmin/doc/CREDITS,v 1.14 2004/05/08 14:11:28 i18phpldapadmin Exp $
|
||||||
* Project Developers:
|
* Project Developers:
|
||||||
|
|
||||||
- David Smith Maintainer
|
- David Smith Maintainer
|
||||||
@ -36,7 +36,7 @@ $Header: /cvsroot/phpldapadmin/phpldapadmin/doc/CREDITS,v 1.13 2004/05/06 20:04:
|
|||||||
Aleksey Soldatov
|
Aleksey Soldatov
|
||||||
- Unknown Italian
|
- Unknown Italian
|
||||||
- Alexandre Maciel Brasilian (Portuguese)
|
- Alexandre Maciel Brasilian (Portuguese)
|
||||||
Elton (CLeGi)
|
Elton Schroeder Fenner (CLeGi)
|
||||||
- Piotr Tarnowski (DrFugazi) Polish
|
- Piotr Tarnowski (DrFugazi) Polish
|
||||||
- Gunnar Nystrom Swedish
|
- Gunnar Nystrom Swedish
|
||||||
|
|
||||||
|
@ -1,6 +1,36 @@
|
|||||||
$Header: /cvsroot/phpldapadmin/phpldapadmin/doc/ChangeLog,v 1.12 2004/04/18 15:54:32 uugdave Exp $
|
$Header: /cvsroot/phpldapadmin/phpldapadmin/doc/ChangeLog,v 1.15 2004/05/11 12:25:23 uugdave Exp $
|
||||||
|
|
||||||
* Version 0.9.4, 2004-04-XX
|
* Version 0.9.4b, 2004-05-11
|
||||||
|
|
||||||
|
* Notes:
|
||||||
|
|
||||||
|
This follow-on release fixes one critical bug contained in 0.9.4
|
||||||
|
relating to session.auto_start and schema caching.
|
||||||
|
|
||||||
|
* Changes
|
||||||
|
|
||||||
|
- Fixed bugs (all duplicates of single bug):
|
||||||
|
947981
|
||||||
|
951003
|
||||||
|
951140
|
||||||
|
- Fixed binary attribute creation (create.php)
|
||||||
|
|
||||||
|
* Version 0.9.4a, 2004-05-08
|
||||||
|
|
||||||
|
* Notes:
|
||||||
|
|
||||||
|
This follow-on release fixes several critical bugs contained in 0.9.4.
|
||||||
|
|
||||||
|
* Changes:
|
||||||
|
|
||||||
|
- Fixed bugs:
|
||||||
|
949500 Error while adding New User Account
|
||||||
|
949500 Creating a new uid under ou=People
|
||||||
|
948695 is_executable() error using phpldapadmin - windows
|
||||||
|
948741 Level: E_WARNING
|
||||||
|
948413 Undefined variable: lang (E_NOTICE) after install
|
||||||
|
|
||||||
|
* Version 0.9.4, 2004-05-04
|
||||||
|
|
||||||
* Notes:
|
* Notes:
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
// $Header: /cvsroot/phpldapadmin/phpldapadmin/functions.php,v 1.180 2004/05/08 13:28:56 uugdave Exp $
|
// $Header: /cvsroot/phpldapadmin/phpldapadmin/functions.php,v 1.181 2004/05/10 12:30:06 uugdave Exp $
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -944,8 +944,6 @@ function is_attr_binary( $server_id, $attr_name )
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@require_once realpath( './schema_functions.php' );
|
|
||||||
|
|
||||||
// See what the server schema says about this attribute
|
// See what the server schema says about this attribute
|
||||||
$schema_attr = get_schema_attribute( $server_id, $attr_name );
|
$schema_attr = get_schema_attribute( $server_id, $attr_name );
|
||||||
if( ! $schema_attr ) {
|
if( ! $schema_attr ) {
|
||||||
|
18
index.php
18
index.php
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
// $Header: /cvsroot/phpldapadmin/phpldapadmin/index.php,v 1.23 2004/05/05 12:30:32 uugdave Exp $
|
// $Header: /cvsroot/phpldapadmin/phpldapadmin/index.php,v 1.24 2004/05/10 12:29:06 uugdave Exp $
|
||||||
|
|
||||||
|
|
||||||
/*******************************************
|
/*******************************************
|
||||||
@ -82,16 +82,6 @@ function check_config()
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Make sure they have all the functions we will need */
|
|
||||||
$required_functions = array( 'htmlspecialchars' );
|
|
||||||
foreach( $required_functions as $function ) {
|
|
||||||
if( ! function_exists( $function ) ) {
|
|
||||||
pla_error( "Your install of PHP appears to be missing the function '<b>$function()</b>' " .
|
|
||||||
"phpLDAPadmin requires this function to work properly." );
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Make sure the config file is readable */
|
/* Make sure the config file is readable */
|
||||||
//if( ! is_readable( 'config.php' ) )
|
//if( ! is_readable( 'config.php' ) )
|
||||||
if( ! is_readable( realpath( 'config.php' ) ) ) {
|
if( ! is_readable( realpath( 'config.php' ) ) ) {
|
||||||
@ -99,6 +89,12 @@ function check_config()
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if( ! is_writable( realpath( ini_get( 'session.save_path' ) ) ) ) {
|
||||||
|
pla_error( "Your PHP session configuration is incorrect. Please check the value of session.save_path
|
||||||
|
in your php.ini to ensure that the directory specified there exists and is writable", false );
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
/* check for syntax errors in config.php */
|
/* check for syntax errors in config.php */
|
||||||
// capture the result of including the file with output buffering
|
// capture the result of including the file with output buffering
|
||||||
ob_start();
|
ob_start();
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
// $Header: /cvsroot/phpldapadmin/phpldapadmin/lang/es.php,v 1.16 2004/03/19 20:13:09 i18phpldapadmin Exp $
|
// $Header: /cvsroot/phpldapadmin/phpldapadmin/lang/es.php,v 1.17 2004/05/10 12:31:04 uugdave Exp $
|
||||||
|
|
||||||
|
|
||||||
// Search form
|
// Search form
|
||||||
@ -301,7 +301,7 @@ $lang['ferror_discription_short'] = '<b>Descripci
|
|||||||
$lang['ferror_submit_bug'] = 'Es un error del phpLDAPadmin? Si así es, por favor <a href=\'%s\'>dínoslo</a>.';
|
$lang['ferror_submit_bug'] = 'Es un error del phpLDAPadmin? Si así es, por favor <a href=\'%s\'>dínoslo</a>.';
|
||||||
$lang['ferror_unrecognized_num'] = 'Número de error desconocido: ';
|
$lang['ferror_unrecognized_num'] = 'Número de error desconocido: ';
|
||||||
$lang['ferror_nonfatil_bug'] = '<center><table class=\'notice\'><tr><td colspan=\'2\'><center><img src=\'images/warning.png\' height=\'12\' width=\'13\' />
|
$lang['ferror_nonfatil_bug'] = '<center><table class=\'notice\'><tr><td colspan=\'2\'><center><img src=\'images/warning.png\' height=\'12\' width=\'13\' />
|
||||||
<b>Has encontrado un error fatal del phpLDAPadmin!</b></td></tr><tr><td>Error:</td><td><b>%s</b> (<b>%s</b>)</td></tr><tr><td>Archivo:</td>
|
<b>Has encontrado un error menor del phpLDAPadmin!</b></td></tr><tr><td>Error:</td><td><b>%s</b> (<b>%s</b>)</td></tr><tr><td>Archivo:</td>
|
||||||
<td><b>%s</b> línea <b>%s</b>, caller <b>%s</b></td></tr><tr><td>Versiones:</td><td>PLA: <b>%s</b>, PHP: <b>%s</b>, SAPI: <b>%s</b>
|
<td><b>%s</b> línea <b>%s</b>, caller <b>%s</b></td></tr><tr><td>Versiones:</td><td>PLA: <b>%s</b>, PHP: <b>%s</b>, SAPI: <b>%s</b>
|
||||||
</td></tr><tr><td>Servidor Web:</td><td><b>%s</b></td></tr><tr><td colspan=\'2\'><center><a target=\'new\' href=\'%s\'>
|
</td></tr><tr><td>Servidor Web:</td><td><b>%s</b></td></tr><tr><td colspan=\'2\'><center><a target=\'new\' href=\'%s\'>
|
||||||
Envía este error haciendo click aquí</a>.</center></td></tr></table></center><br />';
|
Envía este error haciendo click aquí</a>.</center></td></tr></table></center><br />';
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
// $Header: /cvsroot/phpldapadmin/phpldapadmin/lang/recoded/es.php,v 1.11 2004/03/19 20:13:09 i18phpldapadmin Exp $
|
// $Header: /cvsroot/phpldapadmin/phpldapadmin/lang/recoded/es.php,v 1.12 2004/05/10 12:31:04 uugdave Exp $
|
||||||
|
|
||||||
|
|
||||||
// Search form
|
// Search form
|
||||||
@ -301,7 +301,7 @@ $lang['ferror_discription_short'] = '<b>Descripción</b>: (no hay descripción)<
|
|||||||
$lang['ferror_submit_bug'] = 'Es un error del phpLDAPadmin? Si así es, por favor <a href=\'%s\'>dínoslo</a>.';
|
$lang['ferror_submit_bug'] = 'Es un error del phpLDAPadmin? Si así es, por favor <a href=\'%s\'>dínoslo</a>.';
|
||||||
$lang['ferror_unrecognized_num'] = 'Número de error desconocido: ';
|
$lang['ferror_unrecognized_num'] = 'Número de error desconocido: ';
|
||||||
$lang['ferror_nonfatil_bug'] = '<center><table class=\'notice\'><tr><td colspan=\'2\'><center><img src=\'images/warning.png\' height=\'12\' width=\'13\' />
|
$lang['ferror_nonfatil_bug'] = '<center><table class=\'notice\'><tr><td colspan=\'2\'><center><img src=\'images/warning.png\' height=\'12\' width=\'13\' />
|
||||||
<b>Has encontrado un error fatal del phpLDAPadmin!</b></td></tr><tr><td>Error:</td><td><b>%s</b> (<b>%s</b>)</td></tr><tr><td>Archivo:</td>
|
<b>Has encontrado un error menor del phpLDAPadmin!</b></td></tr><tr><td>Error:</td><td><b>%s</b> (<b>%s</b>)</td></tr><tr><td>Archivo:</td>
|
||||||
<td><b>%s</b> línea <b>%s</b>, caller <b>%s</b></td></tr><tr><td>Versiones:</td><td>PLA: <b>%s</b>, PHP: <b>%s</b>, SAPI: <b>%s</b>
|
<td><b>%s</b> línea <b>%s</b>, caller <b>%s</b></td></tr><tr><td>Versiones:</td><td>PLA: <b>%s</b>, PHP: <b>%s</b>, SAPI: <b>%s</b>
|
||||||
</td></tr><tr><td>Servidor Web:</td><td><b>%s</b></td></tr><tr><td colspan=\'2\'><center><a target=\'new\' href=\'%s\'>
|
</td></tr><tr><td>Servidor Web:</td><td><b>%s</b></td></tr><tr><td colspan=\'2\'><center><a target=\'new\' href=\'%s\'>
|
||||||
Envía este error haciendo click aquí</a>.</center></td></tr></table></center><br />';
|
Envía este error haciendo click aquí</a>.</center></td></tr></table></center><br />';
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
// $Header: /cvsroot/phpldapadmin/phpldapadmin/session_functions.php,v 1.6 2004/03/25 13:01:47 uugdave Exp $
|
// $Header: /cvsroot/phpldapadmin/phpldapadmin/session_functions.php,v 1.7 2004/05/10 12:25:58 uugdave Exp $
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A collection of functions to handle sessions throughout phpLDAPadmin.
|
* A collection of functions to handle sessions throughout phpLDAPadmin.
|
||||||
@ -72,6 +72,13 @@ function pla_session_verify_id()
|
|||||||
*/
|
*/
|
||||||
function pla_session_start()
|
function pla_session_start()
|
||||||
{
|
{
|
||||||
|
// If session.auto_start is on in the server's PHP configuration (php.ini), then
|
||||||
|
// we will have problems loading our schema cache since the session will have started
|
||||||
|
// prior to loading the SchemaItem (and descedants) class. Destroy the auto-started
|
||||||
|
// session to prevent this problem.
|
||||||
|
if( ini_get( 'session.auto_start' ) )
|
||||||
|
@session_destroy();
|
||||||
|
|
||||||
// Do we already have a session?
|
// Do we already have a session?
|
||||||
if( session_id() ) {
|
if( session_id() ) {
|
||||||
return;
|
return;
|
||||||
|
Loading…
Reference in New Issue
Block a user