deon/phpldapadmin
1
0
Fork 0
Code Issues 36 Pull Requests Packages Projects Releases Wiki Activity

RELEASE 1.1.0.1

Browse Source
This commit is contained in:
Deon George 2009-06-30 20:46:41 +10:00
parent dd581eb5c8
commit f990f72eb5
18 changed files with 70 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
INSTALL
View File

@ -1,5 +1,5 @@
For install instructions in non-English languages, see the wiki: For install instructions in non-English languages, see the wiki:
http://wiki.phpldapadmin.info http://phpldapadmin.wiki.sourceforge.net
* Requirements * Requirements
@ -17,7 +17,7 @@ For install instructions in non-English languages, see the wiki:
* For additional help * For additional help
See the wiki: See the wiki:
http://wiki.phpldapadmin.info http://phpldapadmin.wiki.sourceforge.net
Join our mailing list: Join our mailing list:
https://lists.sourceforge.net/lists/listinfo/phpldapadmin-devel https://lists.sourceforge.net/lists/listinfo/phpldapadmin-devel

2
VERSION
View File

@ -1 +1 @@
$Name: RELEASE-1_1_0 $ $Name: RELEASE-1_1_0_1 $

3
htdocs/cmd.php
View File

@ -1,7 +1,8 @@
<?php <?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/htdocs/cmd.php,v 1.3 2007/12/15 13:17:43 wurley Exp $ // $Header: /cvsroot/phpldapadmin/phpldapadmin/htdocs/cmd.php,v 1.3.2.1 2007/12/21 12:11:55 wurley Exp $
/** /**
* @package phpLDAPadmin
*/ */
require_once './common.php'; require_once './common.php';

7
htdocs/common.php
View File

@ -1,5 +1,10 @@
<?php <?php
# This is a temporary file // $Header: /cvsroot/phpldapadmin/phpldapadmin/htdocs/common.php,v 1.3.2.1 2007/12/21 12:11:55 wurley Exp $
/**
* @package phpLDAPadmin
*/
@define('LIBDIR',sprintf('%s/',realpath('../lib/'))); @define('LIBDIR',sprintf('%s/',realpath('../lib/')));
require_once LIBDIR.'common.php'; require_once LIBDIR.'common.php';
?> ?>

6
htdocs/draw_tree_node.php
View File

@ -1,4 +1,10 @@
<?php <?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/htdocs/draw_tree_node.php,v 1.2.2.1 2007/12/21 12:11:55 wurley Exp $
/**
* @package phpLDAPadmin
*/
$entry['dn'] = get_request('dn','REQUEST'); $entry['dn'] = get_request('dn','REQUEST');
$entry['server_id'] = get_request('server_id','REQUEST'); $entry['server_id'] = get_request('server_id','REQUEST');
$entry['code'] = get_request('code','REQUEST'); $entry['code'] = get_request('code','REQUEST');

2
htdocs/timeout.php
View File

@ -1,4 +1,6 @@
<?php <?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/htdocs/timeout.php,v 1.5.2.1 2007/12/21 12:11:55 wurley Exp $
/** /**
* Time out page to be displayed on the right frame * Time out page to be displayed on the right frame
* *

6
index.php
View File

@ -1,4 +1,10 @@
<?php <?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/index.php,v 1.2.2.1 2007/12/21 12:11:55 wurley Exp $
/**
* @package phpLDAPadmin
*/
# You should secure your PLA by making the htdocs/ your docroot. # You should secure your PLA by making the htdocs/ your docroot.
header('Location: htdocs/index.php'); header('Location: htdocs/index.php');
die(); die();

14
lib/EntryWriter1.php
View File

@ -1,5 +1,5 @@
<?php <?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/EntryWriter1.php,v 1.3 2007/12/15 09:01:35 wurley Exp $ // $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/EntryWriter1.php,v 1.3.2.1 2007/12/21 11:32:59 wurley Exp $
define('IdEntryRefreshMenuItem', '0'); define('IdEntryRefreshMenuItem', '0');
define('IdEntryExportBaseMenuItem', '1'); define('IdEntryExportBaseMenuItem', '1');
@ -1777,6 +1777,18 @@ class EntryWriter1 extends EntryWriter {
} }
protected function getAttributeDefaultValueHelper($attribute, $i) { protected function getAttributeDefaultValueHelper($attribute, $i) {
$params = $attribute->getProperty('helper');
# Should only return 1 default entry.
if (isset($params['value']) && ! is_array($params['value']))
return $params['value'];
# If there are multiple values, return the first one.
else if (isset($params['value']) && is_array($params['value']))
return array_shift($params['value']);
# No default values, return a blank.
else
return ''; return '';
} }

4
lib/config_default.php
View File

@ -1,5 +1,5 @@
<?php <?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/config_default.php,v 1.27 2007/12/15 11:38:59 wurley Exp $ // $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/config_default.php,v 1.27.2.1 2007/12/20 10:47:20 wurley Exp $
/** /**
* Configuration processing and defaults. * Configuration processing and defaults.
@ -186,7 +186,7 @@ class Config {
$this->default->appearance['tree'] = array( $this->default->appearance['tree'] = array(
'desc'=>'Class name which inherits from Tree class and implements the draw() method', 'desc'=>'Class name which inherits from Tree class and implements the draw() method',
'default'=>'HTMLTree'); 'default'=>'AJAXTree');
$this->default->appearance['entry_factory'] = array( $this->default->appearance['entry_factory'] = array(
'desc'=>'Class name which inherits from EntryFactory class', 'desc'=>'Class name which inherits from EntryFactory class',

6
lib/createlm.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* /*
$Id: createlm.php,v 1.4 2007/12/15 07:50:32 wurley Exp $ $Id: createlm.php,v 1.4.2.1 2007/12/21 12:11:55 wurley Exp $
This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam) This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
Copyright (C) 2004 - 2006 Roland Gruber Copyright (C) 2004 - 2006 Roland Gruber
@ -27,8 +27,6 @@ $Id: createlm.php,v 1.4 2007/12/15 07:50:32 wurley Exp $
* The code is a conversion from createntlm.pl (Benjamin Kuit) and smbdes.c/md4.c (Andrew Tridgell). * The code is a conversion from createntlm.pl (Benjamin Kuit) and smbdes.c/md4.c (Andrew Tridgell).
* *
* @author Roland Gruber * @author Roland Gruber
*
* @package modules
*/ */
/** /**
@ -36,7 +34,7 @@ $Id: createlm.php,v 1.4 2007/12/15 07:50:32 wurley Exp $
* *
* The important functions are lmhash($password) and nthash($password). * The important functions are lmhash($password) and nthash($password).
* *
* @package modules * @package lam
*/ */
class smbHash { class smbHash {

5
lib/emuhash_functions.php
View File

@ -1,9 +1,6 @@
<?php <?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/emuhash_functions.php,v 1.6 2005/03/25 00:59:48 wurley Exp $ // $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/emuhash_functions.php,v 1.6.10.1 2007/12/21 12:11:55 wurley Exp $
/**
* @package other
*/
/******************************************************************************* /*******************************************************************************
* emuhash - partly emulates the php mhash functions * emuhash - partly emulates the php mhash functions
* version: 2004040701 * version: 2004040701

4
lib/functions.php
View File

@ -1,5 +1,5 @@
<?php <?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/functions.php,v 1.303 2007/12/15 07:50:32 wurley Exp $ // $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/functions.php,v 1.303.2.1 2007/12/16 11:02:40 wurley Exp $
/** /**
* A collection of functions used throughout phpLDAPadmin. * A collection of functions used throughout phpLDAPadmin.
@ -1869,7 +1869,7 @@ function dn_unescape($dn) {
*/ */
function get_href($type,$extra_info='') { function get_href($type,$extra_info='') {
$sf = 'https://sourceforge.net'; $sf = 'https://sourceforge.net';
$pla = 'http://wiki.phpldapadmin.info'; $pla = 'http://phpldapadmin.wiki.sourceforge.net';
$group_id = '61828'; $group_id = '61828';
$bug_atid = '498546'; $bug_atid = '498546';
$rfe_atid = '498549'; $rfe_atid = '498549';

29
lib/page.php
View File

@ -1,22 +1,23 @@
<?php <?php
// $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/page.php,v 1.3 2007/12/15 13:17:43 wurley Exp $ // $Header: /cvsroot/phpldapadmin/phpldapadmin/lib/page.php,v 1.3.2.5 2007/12/21 12:51:28 wurley Exp $
/** /**
* Page Rendering Functions * Page Rendering Functions
* @package phpLDAPadmin
*/ */
class page { class page {
# pre-HTML headers # pre-HTML headers
private $_pageheader; protected $_pageheader;
# Items to get into the <head> # Items to get into the <head>
private $_head; protected $_head;
# Settings for this application # Settings for this application
private $_app; protected $_app;
# Default values array. # Default values array.
private $_default; protected $_default;
public function __construct($server_id=null) { public function __construct($server_id=null) {
if (defined('DEBUG_ENABLED') && DEBUG_ENABLED) if (defined('DEBUG_ENABLED') && DEBUG_ENABLED)
@ -34,15 +35,20 @@ class page {
# Capture any output so far (in case we send some headers below) - there shouldnt be any output anyway. # Capture any output so far (in case we send some headers below) - there shouldnt be any output anyway.
$preOutput = ''; $preOutput = '';
if (ob_get_level()) {
# Try and work around if php compression is on, or the user has set compression in the config.
# type = 1 for user gzip, 0 for php.ini gzip.
$obStatus = ob_get_status();
if ($obStatus['type'] && $obStatus['status']) {
$preOutput = ob_get_contents(); $preOutput = ob_get_contents();
ob_end_clean(); ob_end_clean();
} }
//header('Content-type: text/html; charset="UTF-8"'); @todo: Something is sending output to the browser. header('Content-type: text/html; charset="UTF-8"');
if (isset($_SESSION['plaConfig']) if (isset($_SESSION['plaConfig'])
&& $_SESSION['plaConfig']->GetValue('appearance','compress') && $_SESSION['plaConfig']->GetValue('appearance','compress')
&& eregi('gzip',$_SERVER['HTTP_ACCEPT_ENCODING'])) { && eregi('gzip',$_SERVER['HTTP_ACCEPT_ENCODING'])
&& ! ini_get('zlib.output_compression')) {
header('Content-Encoding: gzip'); header('Content-Encoding: gzip');
@ -50,6 +56,11 @@ class page {
debug_log('Sent COMPRESSED header to browser and discarded (%s)',129,__FILE__,__LINE__,__METHOD__,$preOutput); debug_log('Sent COMPRESSED header to browser and discarded (%s)',129,__FILE__,__LINE__,__METHOD__,$preOutput);
} }
if (isset($_SESSION['plaConfig'])
&& $_SESSION['plaConfig']->GetValue('appearance','compress')
&& ini_get('zlib.output_compression'))
$this->setsysmsg(array(array('title'=>_('Warning'),'body'=>_('WARNING: You cannot have PHP compression and phpLDAPadmin compression enabled at the same time. Please unset zlib.output_compression or set $config->custom->appearance[\'compress\']=false'),'type'=>'warn')));
# Turn back on output buffering. # Turn back on output buffering.
ob_start(); ob_start();
@ -321,6 +332,7 @@ class page {
if ($compress && ob_get_level() && isset($_SESSION['plaConfig']) if ($compress && ob_get_level() && isset($_SESSION['plaConfig'])
&& $_SESSION['plaConfig']->GetValue('appearance','compress') && $_SESSION['plaConfig']->GetValue('appearance','compress')
&& ! ini_get('zlib.output_compression')
&& eregi('gzip',$_SERVER['HTTP_ACCEPT_ENCODING'])) { && eregi('gzip',$_SERVER['HTTP_ACCEPT_ENCODING'])) {
$output = ob_get_contents(); $output = ob_get_contents();
@ -400,6 +412,7 @@ class page {
# compress output # compress output
if (ob_get_level() && isset($_SESSION['plaConfig']) if (ob_get_level() && isset($_SESSION['plaConfig'])
&& $_SESSION['plaConfig']->GetValue('appearance','compress') && $_SESSION['plaConfig']->GetValue('appearance','compress')
&& ! ini_get('zlib.output_compression')
&& eregi('gzip',$_SERVER['HTTP_ACCEPT_ENCODING'])) { && eregi('gzip',$_SERVER['HTTP_ACCEPT_ENCODING'])) {
$output = ob_get_contents(); $output = ob_get_contents();

BIN
locale/fi_FI/LC_MESSAGES/messages.mo Normal file
View File

Binary file not shown.

BIN
locale/it_IT/LC_MESSAGES/messages.mo
View File

Binary file not shown.

2
locale/it_IT/LC_MESSAGES/messages.po
View File

@ -1,7 +1,7 @@
# : $ # : $
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: phpldapadmin $Name: RELEASE-1_1_0 $\n" "Project-Id-Version: phpldapadmin messages\n"
"Report-Msgid-Bugs-To: phpldapadmin-devel@lists.sf.net\n" "Report-Msgid-Bugs-To: phpldapadmin-devel@lists.sf.net\n"
"POT-Creation-Date: 2007-12-03 11:45+0200\n" "POT-Creation-Date: 2007-12-03 11:45+0200\n"
"PO-Revision-Date: 2007-12-04 18:22+0100\n" "PO-Revision-Date: 2007-12-04 18:22+0100\n"

2
tools/po/make_mo_all
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
HOME=$PWD HOME=$PWD/$(dirname $0)
cd ../../locale cd ../../locale
for i in $(ls -1); do for i in $(ls -1); do

2
tools/po/messages.header
View File

@ -3,7 +3,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: phpldapadmin $Name: RELEASE-1_1_0 $\n" "Project-Id-Version: phpldapadmin messages\n"
"Report-Msgid-Bugs-To: phpldapadmin-devel@lists.sf.net\n" "Report-Msgid-Bugs-To: phpldapadmin-devel@lists.sf.net\n"
"POT-Creation-Date: 2004-01-14 17:45+0200\n" "POT-Creation-Date: 2004-01-14 17:45+0200\n"
"PO-Revision-Date: 2004-01-14 17:45+0200\n" "PO-Revision-Date: 2004-01-14 17:45+0200\n"