$ff = HTML_FlexyFramework::get();
if(!isset($ff->Pman) || !isset($ff->Pman['local_base_url'])){
- die("Please setup local_base_url");
+ die("Please setup Pman[local_base_url]\n");
}
$this->local_base_url = $ff->Pman['local_base_url'];
)
- ),
+ )
+
)
);
'name' => 'core-person-signup-bcc',
'type' => 0, // system
),
+
+
));
}
$cm->bcc_group = $g->id;
}
- if (empty($cm->test_class)) {
+ // initEmails will always have the latest location of the test class - in theory the user should not be changign the value of this...
+ //if (empty($cm->test_class)) {
if (empty($data['test_class'])) {
$this->jerr("missing test_class for template $name");
}
$cm->test_class = $data['test_class'];
- }
+ //}
require_once $cm->test_class . '.php';
$clsname = str_replace('/','_', $cm->test_class);
if ($done_check) {
return;
}
- if (!empty($this->opts['skip-mysql-check'])) {
+
+
+ if (!empty($this->opts['skip-mysql-checks'])) {
return;
}
// innodb in single files is far more efficient that MYD or one big innodb file.
$db->query("show variables like 'innodb_file_per_table'");
$db->fetch();
if ($db->Value == 'OFF') {
- die("Error: set innodb_file_per_table = 1 in my.cnf\n\n");
+ die("Error: set innodb_file_per_table = 1 in my.cnf (or run with --skip-mysql-checks\n\n");
}
$db = DB_DataObject::factory('core_enum');
}
- function checkSystem()
+ function checkSystem($req = false, $pref = false)
{
// most of these are from File_Convert...
// these are required - and have simple dependancies.
require_once 'System.php';
- $req = array(
+ $req = $req !== false ? $req : array(
'convert',
'grep',
'pdfinfo',
'pdftoppm',
'rsvg-convert', //librsvg2-bin
'strings',
+ 'oathtool'
);
// these are prefered - but may have complicated depenacies
- $pref= array(
+ $pref = $pref !== false ? $pref : array(
'abiword',
'faad',
'ffmpeg',
-}
\ No newline at end of file
+}