diff --git a/admin/tool/dbtransfer/cli/migrate.php b/admin/tool/dbtransfer/cli/migrate.php index 545be35857a..35b3be7c1be 100644 --- a/admin/tool/dbtransfer/cli/migrate.php +++ b/admin/tool/dbtransfer/cli/migrate.php @@ -90,7 +90,7 @@ $drivers = tool_dbtransfer_get_drivers(); if (!isset($options['dbtype'])) { $choose = array(); - foreach ($drivers as $driver=>$name) { + foreach ($drivers as $driver => $name) { list($dbtype, $dblibrary) = explode('/', $driver); $choose[$dbtype] = $dbtype; } @@ -100,7 +100,7 @@ if (!isset($options['dbtype'])) { } $choose = array(); -foreach ($drivers as $driver=>$name) { +foreach ($drivers as $driver => $name) { list($dbtype, $dblibrary) = explode('/', $driver); if ($dbtype === $options['dbtype']) { $choose[$dblibrary] = $dblibrary; @@ -108,7 +108,7 @@ foreach ($drivers as $driver=>$name) { } if (!isset($options['dblibrary']) or !isset($choose[$options['dblibrary']])) { $optionsstr = implode(', ', $choose); - cli_heading('Database library'." ($optionsstr)"); // note: no need to localise unless we add real PDO drivers + cli_heading('Database library'." ($optionsstr)"); // Note: no need to localise unless we add real PDO drivers. $options['dblibrary'] = cli_input(get_string('clitypevalue', 'admin'), '', $choose, true); } @@ -149,7 +149,8 @@ if ($CFG->ostype !== 'WINDOWS') { } } -$a = (object)array('dbtypefrom'=>$CFG->dbtype, 'dbtype'=>$options['dbtype'], 'dbname'=>$options['dbname'], 'dbhost'=>$options['dbhost']); +$a = (object)array('dbtypefrom' => $CFG->dbtype, 'dbtype' => $options['dbtype'], + 'dbname' => $options['dbname'], 'dbhost' => $options['dbhost']); cli_heading(get_string('transferringdbto', 'tool_dbtransfer', $a)); // Try target DB connection. @@ -164,7 +165,8 @@ if ($options['dbsocket']) { $dboptions['dbsocket'] = $options['dbsocket']; } try { - $targetdb->connect($options['dbhost'], $options['dbuser'], $options['dbpass'], $options['dbname'], $options['prefix'], $dboptions); + $targetdb->connect($options['dbhost'], $options['dbuser'], $options['dbpass'], $options['dbname'], + $options['prefix'], $dboptions); if ($targetdb->get_tables()) { $problem .= get_string('targetdatabasenotempty', 'tool_dbtransfer'); } diff --git a/admin/tool/dbtransfer/database_export_form.php b/admin/tool/dbtransfer/database_export_form.php index 50646ad484a..1fb8b9c2ee3 100644 --- a/admin/tool/dbtransfer/database_export_form.php +++ b/admin/tool/dbtransfer/database_export_form.php @@ -29,10 +29,16 @@ require_once($CFG->libdir.'/formslib.php'); /** * Definition of db export settings form. + * + * @package tool_dbtransfer + * @copyright 2008 Petr Skoda {@link http://skodak.org/} + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ class database_export_form extends moodleform { - - function definition() { + /** + * Define the export form. + */ + public function definition() { $mform = $this->_form; $mform->addElement('header', 'database', get_string('dbexport', 'tool_dbtransfer')); diff --git a/admin/tool/dbtransfer/database_transfer_form.php b/admin/tool/dbtransfer/database_transfer_form.php index 9f89b50f1c1..d8a9923a017 100644 --- a/admin/tool/dbtransfer/database_transfer_form.php +++ b/admin/tool/dbtransfer/database_transfer_form.php @@ -30,6 +30,9 @@ require_once(__DIR__.'/locallib.php'); /** * Definition of db transfer settings form. + * + * @copyright 2008 Petr Skoda {@link http://skodak.org/} + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ class database_transfer_form extends moodleform { diff --git a/admin/tool/dbtransfer/dbexport.php b/admin/tool/dbtransfer/dbexport.php index 2672cfd5834..f55b29d0312 100644 --- a/admin/tool/dbtransfer/dbexport.php +++ b/admin/tool/dbtransfer/dbexport.php @@ -40,6 +40,6 @@ if ($data = $form->get_data()) { } echo $OUTPUT->header(); -// TODO: add some more info here +// TODO: add some more info here. $form->display(); echo $OUTPUT->footer(); diff --git a/admin/tool/dbtransfer/locallib.php b/admin/tool/dbtransfer/locallib.php index 6a553eb51d9..8b0b0622f54 100644 --- a/admin/tool/dbtransfer/locallib.php +++ b/admin/tool/dbtransfer/locallib.php @@ -52,7 +52,7 @@ require_once($CFG->libdir.'/dtllib.php'); function tool_dbtransfer_export_xml_database($description, $mdb) { @set_time_limit(0); - session_get_instance()->write_close(); // release session + session_get_instance()->write_close(); // Release session. header('Content-Type: application/xhtml+xml; charset=utf-8'); header('Content-Disposition: attachment; filename=database.xml'); @@ -65,7 +65,7 @@ function tool_dbtransfer_export_xml_database($description, $mdb) { $var = new file_xml_database_exporter('php://output', $mdb); $var->export_database($description); - // no more output + // No more output. die; } @@ -79,7 +79,7 @@ function tool_dbtransfer_export_xml_database($description, $mdb) { function tool_dbtransfer_transfer_database(moodle_database $sourcedb, moodle_database $targetdb, progress_trace $feedback = null) { @set_time_limit(0); - session_get_instance()->write_close(); // release session + session_get_instance()->write_close(); // Release session. $var = new database_mover($sourcedb, $targetdb, true, $feedback); $var->export_database(null); @@ -106,9 +106,9 @@ function tool_dbtransfer_rebuild_target_log_actions(moodle_database $target, pro $DB->delete_records('log_display', array('component'=>'moodle')); log_update_descriptions('moodle'); $plugintypes = get_plugin_types(); - foreach ($plugintypes as $type=>$location) { + foreach ($plugintypes as $type => $location) { $plugs = get_plugin_list($type); - foreach ($plugs as $plug=>$fullplug) { + foreach ($plugs as $plug => $fullplug) { $component = $type.'_'.$plug; $DB->delete_records('log_display', array('component'=>$component)); log_update_descriptions($component); diff --git a/admin/tool/dbtransfer/settings.php b/admin/tool/dbtransfer/settings.php index a1390ef6375..47175423670 100644 --- a/admin/tool/dbtransfer/settings.php +++ b/admin/tool/dbtransfer/settings.php @@ -25,7 +25,9 @@ defined('MOODLE_INTERNAL') || die; if ($hassiteconfig) { - $ADMIN->add('experimental', new admin_externalpage('tooldbtransfer', get_string('dbtransfer', 'tool_dbtransfer'), $CFG->wwwroot.'/'.$CFG->admin.'/tool/dbtransfer/index.php', 'moodle/site:config', false)); + $ADMIN->add('experimental', new admin_externalpage('tooldbtransfer', get_string('dbtransfer', 'tool_dbtransfer'), + $CFG->wwwroot.'/'.$CFG->admin.'/tool/dbtransfer/index.php', 'moodle/site:config', false)); // DB export/import is not ready yet - keep it hidden for now. - $ADMIN->add('experimental', new admin_externalpage('tooldbexport', get_string('dbexport', 'tool_dbtransfer'), $CFG->wwwroot.'/'.$CFG->admin.'/tool/dbtransfer/dbexport.php', 'moodle/site:config', true)); + $ADMIN->add('experimental', new admin_externalpage('tooldbexport', get_string('dbexport', 'tool_dbtransfer'), + $CFG->wwwroot.'/'.$CFG->admin.'/tool/dbtransfer/dbexport.php', 'moodle/site:config', true)); } diff --git a/admin/tool/dbtransfer/version.php b/admin/tool/dbtransfer/version.php index 53113be9a04..59bafe585cf 100644 --- a/admin/tool/dbtransfer/version.php +++ b/admin/tool/dbtransfer/version.php @@ -24,6 +24,6 @@ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2012062200; // The current plugin version (Date: YYYYMMDDXX) -$plugin->requires = 2012061700; // Requires this Moodle version -$plugin->component = 'tool_dbtransfer'; // Full name of the plugin (used for diagnostics) +$plugin->version = 2012062200; // The current plugin version (Date: YYYYMMDDXX). +$plugin->requires = 2012061700; // Requires this Moodle version. +$plugin->component = 'tool_dbtransfer'; // Full name of the plugin (used for diagnostics).