steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include auth.class.php, 1.3, 1.4 form.class.php, 1.4, 1.5 ldap.class.php, 1.8, 1.9 menu.php, 1.1, 1.2 mysmarty.php.in, 1.1, 1.2
cvs at intevation.de
cvs at intevation.de
Mon Jul 19 03:37:02 CEST 2004
Author: steffen
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include
In directory doto:/tmp/cvs-serv24177/kolab-webadmin/php/admin/include
Modified Files:
auth.class.php form.class.php ldap.class.php menu.php
mysmarty.php.in
Log Message:
gettext preparation complete + no hardcoded paths
Index: auth.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/auth.class.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- auth.class.php 16 Jul 2004 12:40:14 -0000 1.3
+++ auth.class.php 19 Jul 2004 01:36:59 -0000 1.4
@@ -1,6 +1,6 @@
<?php
/*
- * Copyright (c) 2004 Klarälvdalens Datakonsult AB
+ * Copyright (c) 2004 KlarÃ��¤lvdalens Datakonsult AB
*
* Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
*
@@ -35,13 +35,12 @@
global $ldap;
$this->error_string = false;
if( !isset( $ldap ) ) {
- print "Server error, no ldap object!";
- //backtrace();
- exit();
+ $this->error_string = _("Server error, no ldap object!");
+ return false;
}
// Anon. bind first
if( !$ldap->bind( $_SESSION['php_dn'], $_SESSION['php_pw'] ) ) {
- $this->error_string = "Could not bind to LDAP server: ".$ldap->error();
+ $this->error_string = _("Could not bind to LDAP server: ").$ldap->error();
$this->gotoLoginPage();
}
if( $this->isAuthenticated() ) {
@@ -52,7 +51,7 @@
if( !$bind_result ) {
// Anon. bind first
if( !$ldap->bind() ) {
- $this->error_string = "Could not bind to LDAP server";
+ $this->error_string = _("Could not bind to LDAP server");
$this->gotoLoginPage();
}
// User not logged in, check login/password
@@ -69,16 +68,16 @@
$_SESSION['remote_ip'] = $_SERVER['REMOTE_ADDR'];
return true;
} else {
- $this->error_string = "Wrong username or password";
+ $this->error_string = _("Wrong username or password");
$this->gotoLoginPage();
}
} else {
- $this->error_string = "Wrong username or password";
+ $this->error_string = _("Wrong username or password");
//$this->error_string = "Dn not found";
$this->gotoLoginPage();
}
} else {
- $this->error_string = 'Please log in as a valid user';
+ $this->error_string = _('Please log in as a valid user');
$this->gotoLoginPage();
}
} else {
@@ -104,14 +103,6 @@
}
function gotoLoginPage() {
- /*echo 'gotoLoginPage: '.$this->error();
- backtrace();
- print phpinfo();
- */
- /*
- if( $this->error() ) Header('Location: /admin/login/?error='.urlencode($this->error()) );
- else Header("Location: /admin/login/");
- */
global $topdir;
$smarty =& new MySmarty();
$smarty->assign( 'topdir', $topdir );
Index: form.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- form.class.php 8 Jul 2004 11:44:37 -0000 1.4
+++ form.class.php 19 Jul 2004 01:36:59 -0000 1.5
@@ -1,6 +1,6 @@
<?php
/*
- * Copyright (c) 2004 KlarÃ��¤lvdalens Datakonsult AB
+ * Copyright (c) 2004 KlarÃ��¿½ï¿½Ã¤lvdalens Datakonsult AB
*
* Writen by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
*
@@ -35,7 +35,7 @@
$this->name = $name;
$this->template = $template;
$this->entries = $entries;
- $this->submittext = 'Submit';
+ $this->submittext = _('Submit');
foreach( $this->entries as $key => $value ) {
if( !isset( $value['type'] ) ) $this->entries[$key]['type'] = '';
if( !isset( $value['comment'] ) ) $this->entries[$key]['comment'] = '';
@@ -55,7 +55,7 @@
}*/
$str .= '<form name="'.$this->name.'" method="post">';
$str .= '<table class="contentformtable">';
- $str .= '<tr><th>Attribute</th><th>Value</th><th>Comment</th></tr>';
+ $str .= _('<tr><th>Attribute</th><th>Value</th><th>Comment</th></tr>');
$size = 60;
foreach( $this->entries as $key => $value ) {
@@ -160,7 +160,7 @@
if( $value['type'] == 'aclselect' ) {
// ignore
} else if( strlen( trim($_REQUEST[$key]) ) == 0 ) {
- $this->errors[] = 'Required field '.$value['name'].' is empty';
+ $this->errors[] = _('Required field ').$value['name']._(' is empty');
}
} else {
if( $value['type'] == 'aclselect' ) {
Index: ldap.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/ldap.class.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ldap.class.php 16 Jul 2004 17:18:03 -0000 1.8
+++ ldap.class.php 19 Jul 2004 01:36:59 -0000 1.9
@@ -1,6 +1,6 @@
<?php
/*
- * Copyright (c) 2004 Klarälvdalens Datakonsult AB
+ * Copyright (c) 2004 Klarälvdalens Datakonsult AB
*
* Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
*
@@ -146,10 +146,10 @@
if( $entries['count'] == 1 ) {
return $entries[0]['uid'][0];
} else {
- $errors[] = "No such object $dn";
+ $errors[] = _("No such object $dn");
}
} else {
- $errors[] = "Problem searching for DN $dn: ".ldap_error($this->connection);
+ $errors[] = _("LDAP Error searching for DN $dn: ").ldap_error($this->connection);
}
return false;
}
@@ -162,7 +162,7 @@
return ldap_get_dn( $this->connection, $entry );
}
} else {
- echo "Problem searching for DN for UID=$uid";
+ echo _("Error searching for DN for UID=$uid");
}
return false;
}
@@ -193,7 +193,8 @@
$filter = '(objectClass=groupOfNames)';
$res = ldap_search( $this->connection, $mybase, $filter, array('member') );
if( !$res ) {
- array_push($errors, "Error: Can't read maintainers group: ".ldap_error($conn) );
+ array_push($errors, _("LDAP Error: Can't read maintainers group: ")
+ .ldap_error($conn) );
return array();
}
$entries = ldap_get_entries( $this->connection, $res );
Index: menu.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/menu.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- menu.php 17 May 2004 15:24:26 -0000 1.1
+++ menu.php 19 Jul 2004 01:36:59 -0000 1.2
@@ -21,71 +21,71 @@
$menuitems = array();
if( $auth->group() == "admin" || $auth->group() == "maintainer" ) {
- $menuitems['user'] = array( 'name' => 'Users',
+ $menuitems['user'] = array( 'name' => _('Users'),
'url' => $topdir.'/user/',
- 'title' => 'Manage Email Users',
+ 'title' => _('Manage Email Users'),
'submenu' => array(
- array( 'name' => 'Create New User',
+ array( 'name' => _('Create New User'),
'url' => 'user.php?action=create' )));
} else {
- $menuitems['user'] = array( 'name' => 'My User Settings',
+ $menuitems['user'] = array( 'name' => _('My User Settings'),
'url' => $topdir.'/user/user.php?action=modify',
- 'title' => 'My User Settings',
+ 'title' => _('My User Settings'),
'submenu' => array(
- array( 'name' => 'Forward Email',
+ array( 'name' => _('Forward Email'),
'url' => 'forward.php' ),
- array( 'name' => 'Vacation',
+ array( 'name' => _('Vacation'),
'url' => 'vacation.php' )));
}
if( $auth->group() == "admin" || $auth->group() == "maintainer" ) {
- $menuitems['addressbook'] = array( 'name' => 'Addressbook',
+ $menuitems['addressbook'] = array( 'name' => _('Addressbook'),
'url' => $topdir.'/addressbook/',
- 'title' => 'Manage Address Book',
+ 'title' => _('Manage Address Book'),
'submenu' => array(
- array( 'name' => 'Create New vCard',
+ array( 'name' => _('Create New vCard'),
'url' => 'addr.php?action=create' )));
- $menuitems['sf'] = array( 'name' => 'Shared Folder',
+ $menuitems['sf'] = array( 'name' => _('Shared Folder'),
'url' => $topdir.'/sharedfolder/',
- 'title' => 'Manage Shared Folders',
+ 'title' => _('Manage Shared Folders'),
'submenu' => array(
- array( 'name' => 'Add Shared Folder',
+ array( 'name' => _('Add Shared Folder'),
'url' => 'sf.php?action=create' )));
}
if( $auth->group() == "admin" ) {
- $menuitems['distlist'] = array( 'name' => 'Distribution Lists',
+ $menuitems['distlist'] = array( 'name' => _('Distribution Lists'),
'url' => $topdir.'/distributionlist/',
- 'title' => 'Manage Distribution Lists',
+ 'title' => _('Manage Distribution Lists'),
'submenu' => array(
- array( 'name' => 'Create New List',
- 'url' => 'list.php?action=create' ) ) );
+ array( 'name' => _('Create New List'),
+ 'url' => _('list.php?action=create') ) ) );
- $menuitems['administrator'] = array( 'name' => 'Administrators',
+ $menuitems['administrator'] = array( 'name' => _('Administrators'),
'url' => $topdir.'/administrator/',
- 'title' => 'Manage Administrators',
+ 'title' => _('Manage Administrators'),
'submenu' => array(
- array( 'name' => 'Create New Administrator',
+ array( 'name' => _('Create New Administrator'),
'url' => 'admin.php?action=create' ) ) );
- $menuitems['maintainer'] = array( 'name' => 'Maintainers',
+ $menuitems['maintainer'] = array( 'name' => _('Maintainers'),
'url' => $topdir.'/maintainer/',
- 'title' => 'Manage Maintainers',
+ 'title' => _('Manage Maintainers'),
'submenu' => array(
- array( 'name' => 'Create New Maintainer',
+ array( 'name' => _('Create New Maintainer'),
'url' => 'maintainer.php?action=create' ) ) );
- $menuitems['service'] = array( 'name' => 'Services',
+ $menuitems['service'] = array( 'name' => _('Services'),
'url' => $topdir.'/service/',
- 'title' => 'Manage Services' );
+ 'title' => _('Manage Services') );
}
-$menuitems['about'] = array( 'name' => 'About Kolab',
+$menuitems['about'] = array( 'name' => _('About Kolab'),
'url' => $topdir.'/kolab/',
- 'title' => 'About Kolab',
+ 'title' => _('About Kolab'),
'submenu' => array(
- array( 'name' => 'Erfrakon',
+ array( 'name' => _('Erfrakon'),
'url' => 'erfrakon.php' ),
- array( 'name' => 'Intevation',
+ array( 'name' => _('Intevation'),
'url' => 'intevation.php' ),
- array( 'name' => 'Klarälvdalens Datakonsult',
+ array( 'name' => _('Klarälvdalens Datakonsult'),
'url' => 'kdab.php' ),
- array( 'name' => 'KDE',
+ array( 'name' => _('KDE'),
'url' => 'kde.php' )
));
/*
Index: mysmarty.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/mysmarty.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mysmarty.php.in 7 Jun 2004 22:29:45 -0000 1.1
+++ mysmarty.php.in 19 Jul 2004 01:36:59 -0000 1.2
@@ -1,6 +1,6 @@
<?php
/*
- * Copyright (c) 2004 Klarälvdalens Datakonsult AB
+ * Copyright (c) 2004 Klarälvdalens Datakonsult AB
*
* Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
*
@@ -21,11 +21,12 @@
require_once('Smarty/Smarty.class.php');
$topdir = '/admin';
+$kolab_prefix = '@prefix@';
// PENDING: Remove this before production(!)
-function count_bytes($tpl_output, &$smarty) {
- return $tpl_output.strlen($tpl_output);
-}
+//function count_bytes($tpl_output, &$smarty) {
+// return $tpl_output.strlen($tpl_output);
+//}
class MySmarty extends Smarty {
function MySmarty() {
More information about the commits
mailing list