X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=UpdateDatabase.php;h=6973f56400cf7effa073fceb1854704cf4c5ab43;hp=2b2a03f012d439cce2dad89ef3f997114d4782fa;hb=HEAD;hpb=27209e8b165ba854698894d86ad4310f74eb7a6c diff --git a/UpdateDatabase.php b/UpdateDatabase.php index 2b2a03f0..6973f564 100644 --- a/UpdateDatabase.php +++ b/UpdateDatabase.php @@ -67,12 +67,24 @@ class Pman_Core_UpdateDatabase extends Pman 'min' => 1, 'max' => 1, ), + 'skip-email-import' => array( + 'desc' => 'Skip email import', + 'default' => '', + 'min' => 1, + 'max' => 1, + ), 'procedures-only' => array( 'desc' => 'Only import procedures (not supported by most modules yet) - ignores sql directory', 'default' => '', 'min' => 1, 'max' => 1, ), + 'disable-create-triggers' => array( + 'desc' => 'So not create the mysql triggers', + 'default' => '', + 'min' => 1, + 'max' => 1, + ), 'json-person' => array( 'desc' => 'Person JSON file', @@ -142,14 +154,14 @@ class Pman_Core_UpdateDatabase extends Pman 'active' => 1, 'description' => '9.1 Management System Password Reset', 'template_dir' => '/Pman/Core/templates/mail/' - - + ) ); var $required_extensions = array( 'curl', - 'gd' + 'gd', + 'mbstring' ); function getAuth() { @@ -164,7 +176,7 @@ class Pman_Core_UpdateDatabase extends Pman parent::getAuth(); // load company! $au = $this->getAuthUser(); if (!$au || $au->company()->comptype != 'OWNER') { - $this->jerr("Not authenticated", array('authFailure' => true)); + $this->jerror("LOGIN-NOAUTH", "Not authenticated", array('authFailure' => true)); } $this->authUser = $au; return true; @@ -237,18 +249,20 @@ class Pman_Core_UpdateDatabase extends Pman // this will trigger errors about freetext indexes - we will have to remove them manually.? // otherwise we need to do an sql query to find them, then remove them (not really worth it as it only affects really old code..) - + echo "Run extensions\n"; + $this->runExtensions(); if (empty($opts['data-only'])) { + echo "Import SQL\n"; $this->importSQL(); } if (!empty($opts['only-module-sql'])) { return; } - + echo "run Update Modules Data\n"; $this->runUpdateModulesData(); @@ -484,6 +498,7 @@ class Pman_Core_UpdateDatabase extends Pman $mysql_cmd = $mysql . ' -h ' . $dburl['host'] . + (empty($dburl['port']) ? '' : " -P{$dburl['port']} ") . ' -u' . escapeshellarg($dburl['user']) . (!empty($dburl['pass']) ? ' -p' . escapeshellarg($dburl['pass']) : '') . ' ' . basename($dburl['path']); @@ -598,7 +613,10 @@ class Pman_Core_UpdateDatabase extends Pman $extra[] = "create sequence {$tbl}_seq;"; } - + if ($tbl && preg_match('#engine=\S+#i', $l, $m)) { + $l = preg_replace('#engine=\S+#i', '', $l); + + } if (preg_match('#alter\s+table\s+(\`[a-z0-9_]+\`)#i', $l, $m)){ $l = preg_replace('#alter\s+table\s+(\`[a-z0-9_]+\`)#i', "ALTER TABLE {$tbl}", $l); } @@ -752,6 +770,7 @@ class Pman_Core_UpdateDatabase extends Pman if(!method_exists($x, 'updateData')){ continue; }; + $x->rootDir = $this->rootDir; echo "$module\n"; $x->updateData(); } @@ -834,21 +853,25 @@ class Pman_Core_UpdateDatabase extends Pman array( 'name' => 'bcc-email', // group who are bcc'ed on all requests. 'type' => 0, // system + 'is_system' => 1, 'display_name' => 'Standard BCC Group' ), array( 'name' => 'system-email-from', 'type' => 0, // system + 'is_system' => 1, 'display_name' => 'Standard System Email From Group' ), array( 'name' => 'core-person-signup-bcc', 'type' => 0, // system + 'is_system' => 1, 'display_name' => 'Standard Person Signup BCC Group' ), array( 'name' => 'Empty Group', // use for no bcc emails. 'type' => 0, + 'is_system' => 1, 'display_name' => 'Standard Empty Group' ) @@ -901,12 +924,13 @@ class Pman_Core_UpdateDatabase extends Pman function updateDataEmails() { + if (!empty($this->opts['skip-email-import'])) { + return; + } foreach ($this->emailTemplates as $k => $mail) { - $mail_dir = "{$this->rootDir}{$mail['template_dir']}"; - $this->initEmails( - $mail_dir, + !empty($mail['template_dir']) ? "{$this->rootDir}{$mail['template_dir']}" : '', array($k => $mail), false ); @@ -930,11 +954,11 @@ class Pman_Core_UpdateDatabase extends Pman $g = DB_DataObject::Factory('core_group')->lookup('name',$data['bcc_group']); - if (empty($g->id)) { + if (empty($g->id)) { // Admin group as bcc will not have any member at initialization. $this->jerr("bcc_group {$data['bcc_group']} does not exist when importing template $name"); } - if (!$g->members('email') && $g->name != 'Empty Group') { + if (!$g->members('email') && $g->name != 'Empty Group' && $g->name != 'Administrators') { $this->jerr("bcc_group {$data['bcc_group']} does not have any members"); } @@ -1006,9 +1030,14 @@ class Pman_Core_UpdateDatabase extends Pman $opts = array( 'update' => 1, - 'file' => $templateDir. $name .'.html' ); - + if (!empty($templateDir)) { + $opts['file'] = $templateDir. $name .'.html'; + } + if (!empty($data['raw_content'])) { + $opts['raw_content'] = $data['raw_content']; + $opts['name'] = $name; + } if (!empty($data['master'])) { $opts['master'] = $templateDir . $master .'.html'; } @@ -1200,15 +1229,18 @@ class Pman_Core_UpdateDatabase extends Pman $dburl = parse_url($ff->database); $dbtype = $dburl['scheme']; - + $dbtype = ($dbtype == 'mysqli') ? 'mysql' : $dbtype; + foreach($this->extensions as $ext) { $scls = ucfirst($dbtype). $ext; $cls = __CLASS__ . '_'. $scls; $fn = implode('/',explode('_', $cls)).'.php'; + if (!file_exists(__DIR__.'/UpdateDatabase/'. $scls .'.php')) { return; } + echo "Running : {$fn}\n"; require_once $fn; $c = new $cls(); @@ -1234,17 +1266,16 @@ class Pman_Core_UpdateDatabase extends Pman 'gifsicle', // used for gif conversions ); - - + // these are prefered - but may have complicated depenacies $pref = $pref !== false ? $pref : array( 'abiword', - 'faad', + //'faad', 'ffmpeg', 'html2text', // not availabe in debian squeeze 'pdftocairo', //poppler-utils - not available in debian squeeze. - 'lame', + //'lame', 'ssconvert', 'unoconv', 'wkhtmltopdf', @@ -1277,10 +1308,13 @@ class Pman_Core_UpdateDatabase extends Pman function clearApacheDataobjectsCache() { - echo "Clearing Database Cache\n"; + // this needs to clear it's own cache along with remote one.. $url = "http://localhost{$this->local_base_url}/Core/RefreshDatabaseCache"; + + echo "Clearing Database Cache : http://localhost{$this->local_base_url}/Core/RefreshDatabaseCache\n"; + $response = $this->curl($url); $json = json_decode($response, true); @@ -1297,7 +1331,7 @@ class Pman_Core_UpdateDatabase extends Pman function clearApacheAssetCache() { - echo "Clearing Asset Cache\n"; + echo "Clearing Asset Cache : http://localhost{$this->local_base_url}/Core/Asset\n"; $response = $this->curl( "http://localhost{$this->local_base_url}/Core/Asset", array( '_clear_cache' => 1 ,'returnHTML' => 'NO' ),