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

fall back to own db_backup for installing timezones, if sqlite extension is not available or broken

Browse Source
This commit is contained in:
Ralf Becker 2014-10-07 13:15:32 +00:00
commit 80f33c47a8
4 changed files with 627 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
calendar/inc/class.calendar_timezones.inc.php
View File

@ -197,13 +197,12 @@ class calendar_timezones
* *
* @param boolean &$updated=null on return true if update was neccessary, false if tz's were already up to date * @param boolean &$updated=null on return true if update was neccessary, false if tz's were already up to date
* @param string $file='calendar/setup/timezones.sqlite' filename relative to EGW_SERVER_ROOT * @param string $file='calendar/setup/timezones.sqlite' filename relative to EGW_SERVER_ROOT
* @param boolean $check_version=true true: check version and only act, if it's different
* @return string message about update * @return string message about update
* @throws egw_exception_wrong_parameter if $file is not readable or wrong format/version * @throws egw_exception_wrong_parameter if $file is not readable or wrong format/version
* @throws egw_exception_assertion_failed if no PDO sqlite support * @throws egw_exception_assertion_failed if no PDO sqlite support
* @throws egw_exception_wrong_userinput for broken sqlite extension * @throws egw_exception_wrong_userinput for broken sqlite extension
*/ */
public static function import_sqlite(&$updated=null,$file='calendar/setup/timezones.sqlite',$check_version=true) public static function import_sqlite(&$updated=null, $file='calendar/setup/timezones.sqlite')
{ {
$path = EGW_SERVER_ROOT.'/'.$file; $path = EGW_SERVER_ROOT.'/'.$file;
@ -213,7 +212,9 @@ class calendar_timezones
} }
if (!check_load_extension('pdo') || !check_load_extension('pdo_sqlite')) if (!check_load_extension('pdo') || !check_load_extension('pdo_sqlite'))
{ {
throw new egw_exception_assertion_failed(__METHOD__."('$file') required SQLite support (PHP extension pdo_sqlite) missing!"); throw new egw_exception_wrong_userinput(__METHOD__."('$file') required SQLite support (PHP extension pdo_sqlite) missing!"."\n".
lang('As an alternative you can %1download a MySQL dump%2 and import it manually into egw_cal_timezones table.',
'', ' (http://dev.egroupware.org/other/egw_cal_timezones.sql.bz2)'));
} }
$pdo = new PDO('sqlite:'.$path); $pdo = new PDO('sqlite:'.$path);
// some PHP pdo_sqlite can for whatever reason NOT read the timezones database (reported eg. on Gentu) // some PHP pdo_sqlite can for whatever reason NOT read the timezones database (reported eg. on Gentu)
@ -221,9 +222,9 @@ class calendar_timezones
if (!($rs = $pdo->query('SELECT version FROM tz_schema_version'))) if (!($rs = $pdo->query('SELECT version FROM tz_schema_version')))
{ {
throw new egw_exception_wrong_userinput( throw new egw_exception_wrong_userinput(
lang('Your PHP extension pdo_sqlite is broken!').'<br />'.lang('It can NOT read timezones from sqlite database %1!',$path).'<br />'. lang('Your PHP extension pdo_sqlite is broken!').'<br />'.lang('It can NOT read timezones from sqlite database %1!',$path)."\n".
lang('As an alternative you can %1download a MySQL dump%2 and import it manually into egw_cal_timezones table.', lang('As an alternative you can %1download a MySQL dump%2 and import it manually into egw_cal_timezones table.',
'<a href="http://dev.egroupware.org/other/egw_cal_timezones.sql.bz2">','</a>')); '', ' (http://dev.egroupware.org/other/egw_cal_timezones.sql.bz2)'));
} }
if ($rs->fetchColumn() != 1) if ($rs->fetchColumn() != 1)
{ {

7
calendar/setup/default_records.inc.php
View File

@ -29,10 +29,9 @@ try
calendar_timezones::import_sqlite(); calendar_timezones::import_sqlite();
calendar_timezones::import_tz_aliases(); calendar_timezones::import_tz_aliases();
} }
// catch broken sqlite extension exception and output message, as user can't do anything about it // catch missing or broken sqlite support and use timezones.db_backup to install timezones
// all other exceptions are fatal, to get user to fix them!
catch (egw_exception_wrong_userinput $e) // all other exceptions are fatal catch (egw_exception_wrong_userinput $e) // all other exceptions are fatal
{ {
_egw_log_exception($e); $db_backup = new db_backup();
echo '<p>'.$e->getMessage()."</p>\n"; $db_backup->restore($db_backup->fopen_backup(EGW_SERVER_ROOT.'/calendar/setup/timezones.db_backup', true), true, '', false);
} }

617
calendar/setup/timezones.db_backup Normal file
View File

File diff suppressed because one or more lines are too long

1
phpgwapi/inc/class.db_backup.inc.php
View File

@ -481,6 +481,7 @@ class db_backup
} }
$rows = array(); $rows = array();
$table = substr($line,7); $table = substr($line,7);
if (!isset($this->schemas[$table])) $this->schemas[$table] = $this->db->get_table_definitions(true, $table);
$cols = self::csv_split($line=fgets($f)); ++$n; $cols = self::csv_split($line=fgets($f)); ++$n;
$blobs = array(); $blobs = array();