holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed not displayed error-message: write failed (webserver has not write-rights). Before writes of tables for new created apps silently fail.

Browse Source
This commit is contained in:
Ralf Becker 2005-04-04 08:50:45 +00:00
parent 56579673b2
commit 51a0ac0f80
2 changed files with 141 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
etemplate/inc/class.db_tools.inc.php
View File

@ -26,8 +26,6 @@
( (
'edit' => True, 'edit' => True,
'needs_save' => True, 'needs_save' => True,
//'admin' => True,
//'preferences' => True
); );
var $debug = 0; var $debug = 0;
@ -50,18 +48,18 @@
// 'abstime' => 'abstime (mysql:timestamp)', // 'abstime' => 'abstime (mysql:timestamp)',
); );
var $setup_header = '<?php var $setup_header = '<?php
/**************************************************************************\\ /**************************************************************************\\
* eGroupWare - Setup * * eGroupWare - Setup *
* http://www.eGroupWare.org * * http://www.eGroupWare.org *
* Created by eTemplates DB-Tools written by ralfbecker@outdoor-training.de * * Created by eTemplates DB-Tools written by ralfbecker@outdoor-training.de *
* -------------------------------------------- * * -------------------------------------------- *
* This program is free software; you can redistribute it and/or modify it * * 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 * * 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 * * Free Software Foundation; either version 2 of the License, or (at your *
* option) any later version. * * option) any later version. *
\\**************************************************************************/ \\**************************************************************************/
/* $Id$ */ /* $Id$ */
'; ';
/** /**
@ -242,11 +240,12 @@
* @param array $cont the content of the form (if called by process_exec) * @param array $cont the content of the form (if called by process_exec)
* @param string $posted_app the app the table is from * @param string $posted_app the app the table is from
* @param string $posted_table the table-name * @param string $posted_table the table-name
* @param string $edited_table the edited table-definitions * @param array $edited_table the edited table-definitions
* @return only if no changes * @return only if no changes
*/ */
function needs_save($cont='',$posted_app='',$posted_table='',$edited_table='') function needs_save($cont='',$posted_app='',$posted_table='',$edited_table='',$msg='')
{ {
//echo "<p>db_tools::needs_save(cont,'$posted_app','$posted_table',edited_table,'$msg')</p> cont=\n"; _debug_array($cont); echo "edited_table="; _debug_array($edited_table);
if (!$posted_app && is_array($cont)) if (!$posted_app && is_array($cont))
{ {
if (isset($cont['yes'])) if (isset($cont['yes']))
@ -268,8 +267,15 @@
} }
$this->setup_version($this->app,'',$tables); $this->setup_version($this->app,'',$tables);
} }
$msg .= $this->write($this->app,$this->data) ? if (!$this->write($this->app,$this->data))
lang('File writen') : lang('Error: writing file (no write-permission for the webserver) !!!'); {
$this->app = $cont['new_app']; // these are the ones, the users whiches to change too
$this->table = $cont['new_table'];
return $this->needs_save('',$cont['app'],$cont['table'],$cont['edited_table'],
lang('Error: writing file (no write-permission for the webserver) !!!'));
}
$msg = lang('File writen');
} }
$this->changes = array(); $this->changes = array();
// return to edit with everything set, so the user gets the table he asked for // return to edit with everything set, so the user gets the table he asked for
@ -299,6 +305,7 @@
return False; // continue edit return False; // continue edit
} }
$content = array( $content = array(
'msg' => $msg,
'app' => $posted_app, 'app' => $posted_app,
'table' => $posted_table, 'table' => $posted_table,
'version' => $this->setup_version($posted_app) 'version' => $this->setup_version($posted_app)
@ -733,7 +740,7 @@
if ($tables != '') if ($tables != '')
{ {
if ($setup_info[$app]['tables']) // if there is already tables array, update it if (isset($setup_info[$app]['tables'])) // if there is already tables array, update it
{ {
$fnew = preg_replace('/(.*\\$'."setup_info\\['$app'\\]\\['tables'\\][ \\t]*=[ \\t]*array\()[^)]*/i","\\1$tables",$fwas=$fnew); $fnew = preg_replace('/(.*\\$'."setup_info\\['$app'\\]\\['tables'\\][ \\t]*=[ \\t]*array\()[^)]*/i","\\1$tables",$fwas=$fnew);
@ -801,7 +808,6 @@
function update($app,$current,$version) function update($app,$current,$version)
{ {
//echo "<p>etemplate.db_tools.update('$app',...,'$version')</p>\n"; //echo "<p>etemplate.db_tools.update('$app',...,'$version')</p>\n";
if (!is_writable(PHPGW_SERVER_ROOT."/$app/setup")) if (!is_writable(PHPGW_SERVER_ROOT."/$app/setup"))
{ {
return False; return False;

228
etemplate/setup/etemplates.inc.php
View File

File diff suppressed because one or more lines are too long