jan/davadmin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixes #11

Browse source 
* the config file handling code has been moved to a separate file which is shared between normal and AJAX code
 * the config file existence is checked and a well formatted error message is sent if it doesn't exist
This commit is contained in:
Jan Dittberner 2007-12-01 20:30:41 +00:00
parent 58fe5e13a3
commit 5cffb1dd17
3 changed files with 58 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
admin/common.inc.php
View file

@ -27,19 +27,8 @@
* 02110-1301 USA. * 02110-1301 USA.
*/ */
/** Include common internationalization code. */ /** Include the code shared between normal pages and AJAX. */
require_once("i18n.inc.php"); require_once("shared.inc.php");
if (!isset($_SERVER['DavAdminConfDir'])) {
header('HTTP/1.0 500 Internal Server Error');
header('Status: 500 Internal Server Error');
header('Content-Type: text/plain;charset=utf8');
print(_("The Server is not configured correctly. Please tell your Administrator to set the DavAdminConfDir environment variable."));
exit();
}
/** Include configuration information. */
require_once($_SERVER['DavAdminConfDir'] . '/config.inc.php');
/** DAV administrator group name. */ /** DAV administrator group name. */
define(ADMIN_GROUP, 'davadmin'); define(ADMIN_GROUP, 'davadmin');

14
admin/getgroups.php
View file

@ -27,18 +27,8 @@
* 02110-1301 USA. * 02110-1301 USA.
*/ */
/** Include common internationalization code. */ /** Include the code shared between normal pages and AJAX. */
require_once("i18n.inc.php"); require_once("shared.inc.php");
if (!isset($_SERVER['DavAdminConfDir'])) {
header('HTTP/1.0 500 Internal Server Error');
header('Status: 500 Internal Server Error');
header('Content-Type: text/plain;charset=utf8');
print(_("The Server is not configured correctly. Please tell your Administrator to set the DavAdminConfDir environment variable."));
exit();
}
/** Include configuration information. */
require_once($_SERVER['DavAdminConfDir'] . '/config.inc.php');
// output is plain text (JSON or an error message) // output is plain text (JSON or an error message)
header("Content-Type: text/plain; charset=UTF-8"); header("Content-Type: text/plain; charset=UTF-8");

54
admin/shared.inc.php Normal file
View file

@ -0,0 +1,54 @@
<?php
/**
* Code shared between normal pages and AJAX for DAVAdmin.
*
* @author Jan Dittberner <jan@dittberner.info>
* @version $Id$
* @license GPL
* @package DAVAdmin
*
* Copyright (c) 2007 Jan Dittberner
*
* This file is part of DAVAdmin.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA.
*/
/** Include common internationalization code. */
require_once("i18n.inc.php");
function _server_error($message) {
header('HTTP/1.0 500 Internal Server Error');
header('Status: 500 Internal Server Error');
header('Content-Type: text/plain;charset=utf8');
print($message);
exit();
}
if (!isset($_SERVER['DavAdminConfDir'])) {
_server_error(_("The Server is not configured correctly. Please tell your Administrator to set the DavAdminConfDir environment variable."));
}
$confname = $_SERVER['DavAdminConfDir'] . DIRECTORY_SEPARATOR .
'config.inc.php';
if (!file_exists($confname)) {
_server_error(sprintf(_("The server configuration file '%s' doesn't exist. Please create the file with correct settings."), $confname));
}
/** Include configuration information. */
require_once($confname);
?>