Permalink
Browse files

Merge branch 'master' of https://github.com/moodle/moodle

  • Loading branch information...
doraemonyoung committed Jun 26, 2012
2 parents 0e47cd5 + 6be7840 commit bf69dc5247b8fdbc88be97d7f803c7cfca5710bc
Showing 1,075 changed files with 11,110 additions and 9,436 deletions.
View
@@ -214,11 +214,7 @@
</FEEDBACK>
</UNICODE>
<DATABASE level="required">
- <VENDOR name="mysql" version="5.0.25">
- <FEEDBACK>
- <ON_ERROR message="mysql416required" />
- </FEEDBACK>
- </VENDOR>
+ <VENDOR name="mysql" version="5.0.25" />
<VENDOR name="postgres" version="8.3" />
<VENDOR name="mssql" version="9.0" />
<VENDOR name="odbc_mssql" version="9.0" />
@@ -335,11 +331,7 @@
</FEEDBACK>
</UNICODE>
<DATABASE level="required">
- <VENDOR name="mysql" version="5.0.25">
- <FEEDBACK>
- <ON_ERROR message="mysql416required" />
- </FEEDBACK>
- </VENDOR>
+ <VENDOR name="mysql" version="5.0.25" />
<VENDOR name="postgres" version="8.3" />
<VENDOR name="mssql" version="9.0" />
<VENDOR name="odbc_mssql" version="9.0" />
@@ -449,11 +441,7 @@
</FEEDBACK>
</UNICODE>
<DATABASE level="required">
- <VENDOR name="mysql" version="5.0.25">
- <FEEDBACK>
- <ON_ERROR message="mysql416required" />
- </FEEDBACK>
- </VENDOR>
+ <VENDOR name="mysql" version="5.0.25" />
<VENDOR name="postgres" version="8.3" />
<VENDOR name="mssql" version="9.0" />
<VENDOR name="odbc_mssql" version="9.0" />
@@ -563,11 +551,7 @@
</FEEDBACK>
</UNICODE>
<DATABASE level="required">
- <VENDOR name="mysql" version="5.0.25">
- <FEEDBACK>
- <ON_ERROR message="mysql416required" />
- </FEEDBACK>
- </VENDOR>
+ <VENDOR name="mysql" version="5.1.33" />
<VENDOR name="postgres" version="8.3" />
<VENDOR name="mssql" version="9.0" />
<VENDOR name="odbc_mssql" version="9.0" />
@@ -14,7 +14,10 @@
$temp->add(new admin_setting_configcheckbox('enablegroupmembersonly', new lang_string('enablegroupmembersonly', 'admin'), new lang_string('configenablegroupmembersonly', 'admin'), 0));
$temp->add(new admin_setting_configcheckbox('dndallowtextandlinks', new lang_string('dndallowtextandlinks', 'admin'), new lang_string('configdndallowtextandlinks', 'admin'), 0));
- $temp->add(new admin_setting_configcheckbox('enablecssoptimiser', new lang_string('enablecssoptimiser','admin'), new lang_string('enablecssoptimiser_desc','admin'), 0));
+ // The CSS optimiser setting. When changed we need to reset the theme caches in order to ensure they are regenerated through the optimiser.
+ $enablecssoptimiser = new admin_setting_configcheckbox('enablecssoptimiser', new lang_string('enablecssoptimiser','admin'), new lang_string('enablecssoptimiser_desc','admin'), 0);
+ $enablecssoptimiser->set_updatedcallback('theme_reset_all_caches');
+ $temp->add($enablecssoptimiser);
$ADMIN->add('experimental', $temp);
@@ -86,7 +86,7 @@
// array of all valid fields for validation
$STD_FIELDS = array('id', 'firstname', 'lastname', 'username', 'email',
'city', 'country', 'lang', 'timezone', 'mailformat',
- 'maildisplay', 'maildigest', 'htmleditor', 'ajax', 'autosubscribe',
+ 'maildisplay', 'maildigest', 'htmleditor', 'autosubscribe',
'institution', 'department', 'idnumber', 'skype',
'msn', 'aim', 'yahoo', 'icq', 'phone1', 'phone2', 'address',
'url', 'description', 'descriptionformat', 'password',
@@ -248,15 +248,6 @@ function definition () {
$mform->setType('htmleditor', PARAM_INT);
}
- if (empty($CFG->enableajax)) {
- $mform->addElement('static', 'ajax', get_string('ajaxuse'), get_string('ajaxno'));
- } else {
- $choices = array( 0 => get_string('ajaxno'), 1 => get_string('ajaxyes'));
- $mform->addElement('select', 'ajax', get_string('ajaxuse'), $choices);
- $mform->setDefault('ajax', 1);
- }
- $mform->setAdvanced('ajax');
-
$mform->addElement('text', 'city', get_string('city'), 'maxlength="100" size="25"');
$mform->setType('city', PARAM_MULTILANG);
if (empty($CFG->defaultcity)) {
@@ -15,8 +15,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * @package tool
- * @subpackage xmldb
+ * @package tool_xmldb
* @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@@ -27,35 +26,35 @@
* Main xmldb action class. It implements all the basic
* functionalities to be shared by each action.
*
- * @package tool
- * @subpackage xmldb
+ * @package tool_xmldb
* @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class XMLDBAction {
- var $does_generate; //Type of value returned by the invoke method
- //ACTION_GENERATE_HTML have contents to show
- //set by each specialized invoke
+ /** @var bool Type of value returned by the invoke method, ACTION_GENERATE_HTML have contents to show, set by each specialized invoke*/
+ protected $does_generate;
- var $title; //Title of the Action (class name, by default)
- //set by parent init automatically
+ /** @var string Title of the Action (class name, by default), set by parent init automatically*/
+ protected $title;
- var $str; //Strings used by the action
- //set by each specialized init, calling loadStrings
+ /** @var string Strings used by the action set by each specialized init, calling loadStrings*/
+ protected $str;
- var $output; //Output of the action
- //set by each specialized invoke, get with getOutput
+ /** @var string Output of the action, set by each specialized invoke, get with getOutput*/
+ protected $output;
- var $errormsg; //Last Error produced. Check when any invoke returns false
- //get with getError
+ /** @var string Last Error produced. Check when any invoke returns false, get with getError*/
+ protected $errormsg;
- var $postaction; //Action to execute at the end of the invoke script
+ /** @var string Action to execute at the end of the invoke script*/
+ protected $postaction;
- var $sesskey_protected; // Actions must be protected by sesskey mechanism
+ /** @var bool Actions must be protected by sesskey mechanism*/
+ protected $sesskey_protected;
/**
- * Constructor to keep PHP5 happy
+ * Constructor
*/
function __construct() {
$this->init();
@@ -76,7 +75,8 @@ function init() {
}
/**
- * returns the type of output of the file
+ * Returns the type of output of the file
+ * @return bool
*/
function getDoesGenerate() {
return $this->does_generate;
@@ -85,6 +85,7 @@ function getDoesGenerate() {
/**
* getError method, returns the last error string.
* Used if the invoke() methods returns false
+ * @return string
*/
function getError() {
return $this->errormsg;
@@ -93,6 +94,7 @@ function getError() {
/**
* getOutput method, returns the output generated by the action.
* Used after execution of the invoke() methods if they return true
+ * @return string
*/
function getOutput() {
return $this->output;
@@ -101,6 +103,7 @@ function getOutput() {
/**
* getPostAction method, returns the action to launch after executing
* another one
+ * @return string
*/
function getPostAction() {
return $this->postaction;
@@ -109,6 +112,7 @@ function getPostAction() {
/**
* getTitle method returns the title of the action (that is part
* of the $str array attribute
+ * @return string
*/
function getTitle() {
return $this->str['title'];
@@ -117,6 +121,7 @@ function getTitle() {
/**
* loadStrings method, loads the required strings specified in the
* array parameter
+ * @params array $strings
*/
function loadStrings($strings) {
// Load some commonly used strings
@@ -162,6 +167,8 @@ function invoke() {
/**
* launch method, used to easily call invoke methods between actions
+ * @param string $action
+ * @return mixed
*/
function launch($action) {
@@ -15,8 +15,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * @package tool
- * @subpackage xmldb
+ * @package tool_xmldb
* @copyright 2008 onwards Tim Hunt
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@@ -25,14 +24,13 @@
* This is a base class for the various actions that interate over all the
* tables and check some aspect of their definition.
*
- * @package tool
- * @subpackage xmldb
+ * @package tool_xmldb
* @copyright 2008 onwards Tim Hunt
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
abstract class XMLDBCheckAction extends XMLDBAction {
/**
- * This string is displayed with a yes/no choice before the report is run.
+ * @var string This string is displayed with a yes/no choice before the report is run.
* You must set this to the name of a lang string in xmldb.php before calling init.
*/
protected $introstr = '';
@@ -117,7 +115,7 @@ function invoke() {
// Iterate over $XMLDB->dbdirs, loading their XML data to memory
if ($XMLDB->dbdirs) {
- $dbdirs =& $XMLDB->dbdirs;
+ $dbdirs = $XMLDB->dbdirs;
$o='<ul>';
foreach ($dbdirs as $dbdir) {
// Only if the directory exists
@@ -15,8 +15,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * @package tool
- * @subpackage xmldb
+ * @package tool_xmldb
* @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@@ -25,8 +24,7 @@
* reporting about the ones not physically implemented as BIGINTs
* and providing one SQL script to fix all them. MDL-11038
*
- * @package tool
- * @subpackage xmldb
+ * @package tool_xmldb
* @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@@ -15,8 +15,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * @package tool
- * @subpackage xmldb
+ * @package tool_xmldb
* @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@@ -26,8 +25,7 @@
* match those specified in the xml specs
* and providing one SQL script to fix all them.
*
- * @package tool
- * @subpackage xmldb
+ * @package tool_xmldb
* @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@@ -15,8 +15,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * @package tool
- * @subpackage xmldb
+ * @package tool_xmldb
* @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@@ -30,8 +29,7 @@
* Each 0 in that column will violate the foreign key, but we ignore them.
* If you want a strict check performed, then add &strict=1 to the URL.
*
- * @package tool
- * @subpackage xmldb
+ * @package tool_xmldb
* @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@@ -15,8 +15,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * @package tool
- * @subpackage xmldb
+ * @package tool_xmldb
* @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@@ -26,8 +25,7 @@
* with the physical DB implementation, reporting about all the missing
* indexes to be created to be 100% ok.
*
- * @package tool
- * @subpackage xmldb
+ * @package tool_xmldb
* @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * @package xmldb-editor
+ * @package tool_xmldb
* @copyright 2011 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@@ -28,7 +28,7 @@
* them by changing to cross-db (CHAR) length semantics.
* See MDL-29322 for more details.
*
- * @package xmldb-editor
+ * @package tool_xmldb
* @copyright 2011 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@@ -15,15 +15,13 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * @package tool
- * @subpackage xmldb
+ * @package tool_xmldb
* @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
/**
- * @package tool
- * @subpackage xmldb
+ * @package tool_xmldb
* @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
Oops, something went wrong.

0 comments on commit bf69dc5

Please sign in to comment.