Browse files

Merge branch 'master' of git://github.com/moodle/moodle into master_M…

…DL-30577
  • Loading branch information...
2 parents ab94be6 + f89a83b commit 3cf721bf231a2d6ebe06a70a91c48e20ef2568a0 @mayankgupta mayankgupta committed Dec 12, 2011
Showing with 629 additions and 302 deletions.
  1. +12 −1 admin/lib.php
  2. +21 −0 admin/roles/admins.php
  3. +23 −5 admin/roles/lib.php
  4. +1 −0 admin/settings/security.php
  5. +2 −1 admin/tool/customlang/db/upgrade.php
  6. +3 −0 auth/manual/db/upgrade.php
  7. +3 −0 auth/mnet/db/upgrade.php
  8. +3 −0 blocks/community/db/upgrade.php
  9. +57 −20 blocks/edit_form.php
  10. +3 −0 blocks/html/db/upgrade.php
  11. +6 −1 blocks/login/block_login.php
  12. +3 −0 blocks/navigation/db/upgrade.php
  13. +3 −0 blocks/settings/db/upgrade.php
  14. +30 −0 course/format/scorm/version.php
  15. +30 −0 course/format/social/version.php
  16. +30 −0 course/format/topics/version.php
  17. +30 −0 course/format/weeks/version.php
  18. +3 −0 enrol/authorize/db/upgrade.php
  19. +3 −0 enrol/database/db/upgrade.php
  20. +1 −1 enrol/database/lib.php
  21. +2 −0 enrol/flatfile/db/upgrade.php
  22. +46 −0 enrol/guest/db/upgrade.php
  23. +16 −0 enrol/guest/lib.php
  24. +1 −1 enrol/guest/version.php
  25. +3 −0 enrol/imsenterprise/db/upgrade.php
  26. +4 −0 enrol/imsenterprise/lib.php
  27. +3 −0 enrol/mnet/db/upgrade.php
  28. +3 −0 enrol/paypal/db/upgrade.php
  29. 0 filter/emailprotect/{vesion.php → version.php}
  30. +3 −0 filter/mediaplugin/db/upgrade.php
  31. +3 −0 filter/tex/db/upgrade.php
  32. +3 −0 grade/grading/form/rubric/db/upgrade.php
  33. +1 −1 grade/report/user/index.php
  34. +1 −1 index.php
  35. +1 −1 install/lang/af/admin.php
  36. +1 −1 install/lang/af/langconfig.php
  37. +1 −1 install/lang/am/install.php
  38. +1 −1 install/lang/am/langconfig.php
  39. +1 −1 install/lang/am/moodle.php
  40. +1 −1 install/lang/ar/admin.php
  41. +1 −1 install/lang/ar/error.php
  42. +1 −1 install/lang/ar/install.php
  43. +1 −1 install/lang/ar/langconfig.php
  44. +1 −1 install/lang/ar/moodle.php
  45. +1 −1 install/lang/ast/admin.php
  46. +1 −1 install/lang/ast/error.php
  47. +1 −1 install/lang/ast/install.php
  48. +1 −1 install/lang/ast/langconfig.php
  49. +1 −1 install/lang/ast/moodle.php
  50. +1 −1 install/lang/az/admin.php
  51. +1 −1 install/lang/az/error.php
  52. +1 −1 install/lang/az/install.php
  53. +1 −1 install/lang/az/langconfig.php
  54. +1 −1 install/lang/be/langconfig.php
  55. +1 −1 install/lang/be/moodle.php
  56. +1 −1 install/lang/bg/admin.php
  57. +1 −1 install/lang/bg/error.php
  58. +1 −1 install/lang/bg/install.php
  59. +1 −1 install/lang/bg/langconfig.php
  60. +1 −1 install/lang/bg/moodle.php
  61. +1 −1 install/lang/bn/admin.php
  62. +1 −1 install/lang/bn/install.php
  63. +1 −1 install/lang/bn/langconfig.php
  64. +1 −1 install/lang/bn/moodle.php
  65. +1 −1 install/lang/bs/install.php
  66. +1 −1 install/lang/bs/langconfig.php
  67. +1 −1 install/lang/ca/admin.php
  68. +1 −1 install/lang/ca/error.php
  69. +1 −1 install/lang/ca/install.php
  70. +1 −1 install/lang/ca/langconfig.php
  71. +1 −1 install/lang/ca/moodle.php
  72. +1 −1 install/lang/ckb/langconfig.php
  73. +1 −1 install/lang/cs/admin.php
  74. +1 −1 install/lang/cs/error.php
  75. +3 −1 install/lang/cs/install.php
  76. +1 −1 install/lang/cs/langconfig.php
  77. +1 −1 install/lang/cs/moodle.php
  78. +1 −1 install/lang/cy/admin.php
  79. +1 −1 install/lang/cy/error.php
  80. +1 −1 install/lang/cy/install.php
  81. +1 −1 install/lang/cy/langconfig.php
  82. +1 −1 install/lang/cy/moodle.php
  83. +1 −1 install/lang/da/admin.php
  84. +1 −1 install/lang/da/error.php
  85. +2 −2 install/lang/da/install.php
  86. +1 −1 install/lang/da/langconfig.php
  87. +1 −1 install/lang/da/moodle.php
  88. +1 −1 install/lang/de/admin.php
  89. +1 −1 install/lang/de/error.php
  90. +1 −1 install/lang/de/install.php
  91. +1 −1 install/lang/de/langconfig.php
  92. +1 −1 install/lang/de/moodle.php
  93. +1 −1 install/lang/de_du/error.php
  94. +1 −1 install/lang/de_du/install.php
  95. +1 −1 install/lang/de_du/langconfig.php
  96. +1 −1 install/lang/de_kids/langconfig.php
  97. +1 −1 install/lang/dv/admin.php
  98. +1 −1 install/lang/dv/error.php
  99. +1 −1 install/lang/dv/install.php
  100. +1 −1 install/lang/dv/langconfig.php
  101. +1 −1 install/lang/dv/moodle.php
  102. +1 −1 install/lang/el/admin.php
  103. +1 −1 install/lang/el/error.php
  104. +1 −1 install/lang/el/install.php
  105. +1 −1 install/lang/el/langconfig.php
  106. +1 −1 install/lang/el/moodle.php
  107. +1 −1 install/lang/en/admin.php
  108. +1 −1 install/lang/en/error.php
  109. +1 −1 install/lang/en/install.php
  110. +1 −1 install/lang/en/langconfig.php
  111. +1 −1 install/lang/en/moodle.php
  112. +1 −1 install/lang/en_us/install.php
  113. +1 −1 install/lang/en_us/langconfig.php
  114. +1 −1 install/lang/es/admin.php
  115. +1 −1 install/lang/es/error.php
  116. +5 −4 install/lang/es/install.php
  117. +1 −1 install/lang/es/langconfig.php
  118. +1 −1 install/lang/es/moodle.php
  119. +1 −1 install/lang/es_ar/langconfig.php
  120. +1 −1 install/lang/es_es/langconfig.php
  121. +1 −1 install/lang/es_mx/langconfig.php
  122. +1 −1 install/lang/et/admin.php
  123. +1 −1 install/lang/et/error.php
  124. +1 −1 install/lang/et/install.php
  125. +1 −1 install/lang/et/langconfig.php
  126. +1 −1 install/lang/et/moodle.php
  127. +1 −1 install/lang/eu/admin.php
  128. +1 −1 install/lang/eu/error.php
  129. +1 −1 install/lang/eu/install.php
  130. +1 −1 install/lang/eu/langconfig.php
  131. +1 −1 install/lang/eu/moodle.php
  132. +1 −1 install/lang/fa/admin.php
  133. +1 −1 install/lang/fa/install.php
  134. +1 −1 install/lang/fa/langconfig.php
  135. +1 −1 install/lang/fa/moodle.php
  136. +1 −1 install/lang/fi/admin.php
  137. +1 −1 install/lang/fi/error.php
  138. +1 −1 install/lang/fi/install.php
  139. +1 −1 install/lang/fi/langconfig.php
  140. +1 −1 install/lang/fi/moodle.php
  141. +1 −1 install/lang/fil/langconfig.php
  142. +1 −1 install/lang/fil/moodle.php
  143. +1 −1 install/lang/fj/langconfig.php
  144. +1 −1 install/lang/fr/admin.php
  145. +1 −1 install/lang/fr/error.php
  146. +1 −1 install/lang/fr/install.php
  147. +1 −1 install/lang/fr/langconfig.php
  148. +1 −1 install/lang/fr/moodle.php
  149. +1 −1 install/lang/fr_ca/install.php
  150. +1 −1 install/lang/fr_ca/langconfig.php
  151. +1 −1 install/lang/fr_ca/moodle.php
  152. +1 −1 install/lang/ga/langconfig.php
  153. +1 −1 install/lang/gd/langconfig.php
  154. +1 −1 install/lang/gl/admin.php
  155. +1 −1 install/lang/gl/error.php
  156. +1 −1 install/lang/gl/install.php
  157. +1 −1 install/lang/gl/langconfig.php
  158. +1 −1 install/lang/gl/moodle.php
  159. +1 −1 install/lang/gu/error.php
  160. +1 −1 install/lang/gu/langconfig.php
  161. +1 −1 install/lang/gu/moodle.php
  162. +1 −1 install/lang/he/admin.php
  163. +1 −1 install/lang/he/error.php
  164. +1 −1 install/lang/he/install.php
  165. +1 −1 install/lang/he/langconfig.php
  166. +1 −1 install/lang/he/moodle.php
  167. +1 −1 install/lang/hi/langconfig.php
  168. +1 −1 install/lang/hi/moodle.php
  169. +1 −1 install/lang/hr/admin.php
  170. +1 −1 install/lang/hr/error.php
  171. +1 −1 install/lang/hr/install.php
  172. +1 −1 install/lang/hr/langconfig.php
  173. +1 −1 install/lang/hr/moodle.php
  174. +1 −1 install/lang/hu/admin.php
  175. +1 −1 install/lang/hu/error.php
  176. +1 −1 install/lang/hu/install.php
  177. +1 −1 install/lang/hu/langconfig.php
  178. +1 −1 install/lang/hu/moodle.php
  179. +1 −1 install/lang/hy/admin.php
  180. +1 −1 install/lang/hy/error.php
  181. +1 −1 install/lang/hy/install.php
  182. +1 −1 install/lang/hy/langconfig.php
  183. +1 −1 install/lang/hy/moodle.php
  184. +1 −1 install/lang/id/langconfig.php
  185. +1 −1 install/lang/id/moodle.php
  186. +1 −1 install/lang/is/admin.php
  187. +1 −1 install/lang/is/error.php
  188. +1 −1 install/lang/is/install.php
  189. +1 −1 install/lang/is/langconfig.php
  190. +1 −1 install/lang/is/moodle.php
  191. +1 −1 install/lang/it/admin.php
  192. +1 −1 install/lang/it/error.php
  193. +1 −1 install/lang/it/install.php
  194. +1 −1 install/lang/it/langconfig.php
  195. +1 −1 install/lang/it/moodle.php
  196. +1 −1 install/lang/ja/admin.php
  197. +1 −1 install/lang/ja/error.php
  198. +1 −1 install/lang/ja/install.php
  199. +1 −1 install/lang/ja/langconfig.php
  200. +1 −1 install/lang/ja/moodle.php
  201. +1 −1 install/lang/ka/admin.php
  202. +1 −1 install/lang/ka/install.php
  203. +1 −1 install/lang/ka/langconfig.php
  204. +1 −1 install/lang/kk/install.php
  205. +1 −1 install/lang/kk/langconfig.php
  206. +1 −1 install/lang/kk/moodle.php
  207. +1 −1 install/lang/km/admin.php
  208. +1 −1 install/lang/km/error.php
  209. +1 −1 install/lang/km/install.php
  210. +1 −1 install/lang/km/langconfig.php
  211. +1 −1 install/lang/km/moodle.php
  212. +1 −1 install/lang/kn/langconfig.php
  213. +1 −1 install/lang/ko/admin.php
  214. +1 −1 install/lang/ko/error.php
  215. +1 −1 install/lang/ko/install.php
  216. +1 −1 install/lang/ko/langconfig.php
  217. +1 −1 install/lang/ko/moodle.php
  218. +1 −1 install/lang/la/langconfig.php
  219. +1 −1 install/lang/la/moodle.php
  220. +1 −1 install/lang/lo/admin.php
  221. +1 −1 install/lang/lo/install.php
  222. +1 −1 install/lang/lo/langconfig.php
  223. +1 −1 install/lang/lo/moodle.php
  224. +1 −1 install/lang/lt/langconfig.php
  225. +1 −1 install/lang/lt/moodle.php
  226. +1 −1 install/lang/lv/admin.php
  227. +1 −1 install/lang/lv/error.php
  228. +1 −1 install/lang/lv/install.php
  229. +1 −1 install/lang/lv/langconfig.php
  230. +1 −1 install/lang/lv/moodle.php
  231. +1 −1 install/lang/mi_tn/langconfig.php
  232. +1 −1 install/lang/mi_tn/moodle.php
  233. +1 −1 install/lang/mi_wwow/admin.php
  234. +1 −1 install/lang/mi_wwow/error.php
  235. +1 −1 install/lang/mi_wwow/install.php
  236. +1 −1 install/lang/mi_wwow/langconfig.php
  237. +1 −1 install/lang/mi_wwow/moodle.php
  238. +1 −1 install/lang/mk/admin.php
  239. +1 −1 install/lang/mk/error.php
  240. +1 −1 install/lang/mk/install.php
  241. +1 −1 install/lang/mk/langconfig.php
  242. +1 −1 install/lang/mk/moodle.php
  243. +1 −1 install/lang/ml/langconfig.php
  244. +1 −1 install/lang/ml/moodle.php
  245. +1 −1 install/lang/mn/admin.php
  246. +1 −1 install/lang/mn/error.php
  247. +1 −1 install/lang/mn/install.php
  248. +1 −1 install/lang/mn/langconfig.php
  249. +1 −1 install/lang/mn/moodle.php
  250. +1 −1 install/lang/mr/admin.php
  251. +1 −1 install/lang/mr/error.php
  252. +1 −1 install/lang/mr/install.php
  253. +1 −1 install/lang/mr/langconfig.php
  254. +1 −1 install/lang/mr/moodle.php
  255. +1 −1 install/lang/ms/langconfig.php
  256. +1 −1 install/lang/ne/langconfig.php
  257. +1 −1 install/lang/nl/admin.php
  258. +1 −1 install/lang/nl/error.php
  259. +1 −1 install/lang/nl/install.php
  260. +1 −1 install/lang/nl/langconfig.php
  261. +1 −1 install/lang/nl/moodle.php
  262. +1 −1 install/lang/nn/langconfig.php
  263. +1 −1 install/lang/nn/moodle.php
  264. +1 −1 install/lang/no/admin.php
  265. +1 −1 install/lang/no/error.php
  266. +1 −1 install/lang/no/install.php
  267. +1 −1 install/lang/no/langconfig.php
  268. +1 −1 install/lang/no/moodle.php
  269. +1 −1 install/lang/no_gr/langconfig.php
  270. +1 −1 install/lang/no_gr/moodle.php
  271. +1 −1 install/lang/oc_es/langconfig.php
  272. +1 −1 install/lang/pl/admin.php
  273. +1 −1 install/lang/pl/error.php
  274. +1 −1 install/lang/pl/install.php
  275. +1 −1 install/lang/pl/langconfig.php
  276. +1 −1 install/lang/pl/moodle.php
  277. +1 −1 install/lang/pt/admin.php
  278. +1 −1 install/lang/pt/error.php
  279. +1 −1 install/lang/pt/install.php
  280. +1 −1 install/lang/pt/langconfig.php
  281. +1 −1 install/lang/pt/moodle.php
  282. +1 −1 install/lang/pt_br/admin.php
  283. +1 −1 install/lang/pt_br/error.php
  284. +1 −1 install/lang/pt_br/install.php
  285. +1 −1 install/lang/pt_br/langconfig.php
  286. +1 −1 install/lang/pt_br/moodle.php
  287. +1 −1 install/lang/ro/admin.php
  288. +1 −1 install/lang/ro/error.php
  289. +1 −1 install/lang/ro/install.php
  290. +1 −1 install/lang/ro/langconfig.php
  291. +1 −1 install/lang/ro/moodle.php
  292. +1 −1 install/lang/ru/admin.php
  293. +1 −1 install/lang/ru/error.php
  294. +1 −1 install/lang/ru/install.php
  295. +1 −1 install/lang/ru/langconfig.php
  296. +1 −1 install/lang/ru/moodle.php
  297. +1 −1 install/lang/si/admin.php
  298. +1 −1 install/lang/si/error.php
  299. +1 −1 install/lang/si/install.php
  300. +1 −1 install/lang/si/langconfig.php
Sorry, we could not display the entire diff because too many files (472) changed.
View
13 admin/lib.php
@@ -35,5 +35,16 @@ function admin_page_type_list($pagetype, $parentcontext, $currentcontext) {
'admin-*' => get_string('page-admin-x', 'pagetype'),
$pagetype => get_string('page-admin-current', 'pagetype')
);
+ // Add the missing * (any page) option for them. MDL-30340
+ // TODO: These pages are really 'pagetype-varying' - MDL-30564 -
+ // and some day we should stop behaving that way, so proper pagetypes
+ // can be specified for it (like course-category-* or so).
+ // Luckly... the option we are introducing '*' is independent
+ // of that varying behavior, so will work.
+ if ($pagetype == 'admin-course-category') {
+ $array += array(
+ '*' => get_string('page-x', 'pagetype')
+ );
+ }
return $array;
-}
+}
View
21 admin/roles/admins.php
@@ -67,6 +67,26 @@
}
}
+} else if (optional_param('main', false, PARAM_BOOL) and confirm_sesskey()) {
+ if ($newmain = $admisselector->get_selected_users()) {
+ $newmain = reset($newmain);
+ $newmain = $newmain->id;
+ $admins = array();
+ foreach(explode(',', $CFG->siteadmins) as $admin) {
+ $admin = (int)$admin;
+ if ($admin) {
+ $admins[$admin] = $admin;
+ }
+ }
+
+ if (isset($admins[$newmain])) {
+ unset($admins[$newmain]);
+ array_unshift($admins, $newmain);
+ set_config('siteadmins', implode(',', $admins));
+ redirect($PAGE->url);
+ }
+ }
+
} else if ($confirmadd and confirm_sesskey()) {
$admins = array();
foreach(explode(',', $CFG->siteadmins) as $admin) {
@@ -115,6 +135,7 @@
<p class="arrow_button">
<input name="add" id="add" type="submit" value="<?php echo $OUTPUT->larrow().'&nbsp;'.get_string('add'); ?>" title="<?php print_string('add'); ?>" /><br />
<input name="remove" id="remove" type="submit" value="<?php echo get_string('remove').'&nbsp;'.$OUTPUT->rarrow(); ?>" title="<?php print_string('remove'); ?>" />
+ <input name="main" id="main" type="submit" value="<?php echo get_string('mainadminset', 'role'); ?>" title="<?php print_string('mainadminset', 'role'); ?>" />
</p>
</td>
<td id='potentialcell'>
View
28 admin/roles/lib.php
@@ -1584,13 +1584,31 @@ public function find_users($search) {
return array();
}
- if ($search) {
- $groupname = get_string('extusersmatching', 'role', $search);
- } else {
- $groupname = get_string('extusers', 'role');
+ $mainadmin = array();
+ $adminids = explode(',', $CFG->siteadmins);
+ foreach ($adminids as $id) {
+ if (isset($availableusers[$id])) {
+ $mainadmin = array($id=>$availableusers[$id]);
+ unset($availableusers[$id]);
+ break;
+ }
}
- return array($groupname => $availableusers);
+ $result = array();
+ if ($mainadmin) {
+ $result[get_string('mainadmin', 'role')] = $mainadmin;
+ }
+
+ if ($availableusers) {
+ if ($search) {
+ $groupname = get_string('extusersmatching', 'role', $search);
+ } else {
+ $groupname = get_string('extusers', 'role');
+ }
+ $result[$groupname] = $availableusers;
+ }
+
+ return $result;
}
protected function get_options() {
View
1 admin/settings/security.php
@@ -81,6 +81,7 @@
$temp->add(new admin_setting_configcheckbox('cookiesecure', get_string('cookiesecure', 'admin'), get_string('configcookiesecure', 'admin'), 0));
$temp->add(new admin_setting_configcheckbox('cookiehttponly', get_string('cookiehttponly', 'admin'), get_string('configcookiehttponly', 'admin'), 0));
$temp->add(new admin_setting_configcheckbox('allowframembedding', get_string('allowframembedding', 'admin'), get_string('allowframembedding_help', 'admin'), 0));
+ $temp->add(new admin_setting_configcheckbox('loginpasswordautocomplete', get_string('loginpasswordautocomplete', 'admin'), get_string('loginpasswordautocomplete_help', 'admin'), 0));
$ADMIN->add('security', $temp);
View
3 admin/tool/customlang/db/upgrade.php
@@ -29,7 +29,8 @@ function xmldb_tool_customlang_upgrade($oldversion) {
$dbman = $DB->get_manager();
-
+ // Moodle v2.2.0 release upgrade line
+ // Put any upgrade step following this
return true;
}
View
3 auth/manual/db/upgrade.php
@@ -48,5 +48,8 @@ function xmldb_auth_manual_upgrade($oldversion) {
// Moodle v2.1.0 release upgrade line
// Put any upgrade step following this
+ // Moodle v2.2.0 release upgrade line
+ // Put any upgrade step following this
+
return true;
}
View
3 auth/mnet/db/upgrade.php
@@ -46,5 +46,8 @@ function xmldb_auth_mnet_upgrade($oldversion) {
// Moodle v2.1.0 release upgrade line
// Put any upgrade step following this
+ // Moodle v2.2.0 release upgrade line
+ // Put any upgrade step following this
+
return true;
}
View
3 blocks/community/db/upgrade.php
@@ -76,5 +76,8 @@ function xmldb_block_community_upgrade($oldversion) {
// Moodle v2.1.0 release upgrade line
// Put any upgrade step following this
+ // Moodle v2.2.0 release upgrade line
+ // Put any upgrade step following this
+
return true;
}
View
77 blocks/edit_form.php
@@ -93,24 +93,44 @@ function definition() {
$mform->addElement('static', 'bui_homecontext', get_string('createdat', 'block'), print_context_name($parentcontext));
$mform->addHelpButton('bui_homecontext', 'createdat', 'block');
+ // For pre-calculated (fixed) pagetype lists
+ $pagetypelist = array();
+
// parse pagetype patterns
$bits = explode('-', $this->page->pagetype);
- $contextoptions = array();
- if ( ($parentcontext->contextlevel == CONTEXT_COURSE && $parentcontext->instanceid == SITEID) ||
- ($parentcontext->contextlevel == CONTEXT_SYSTEM)) { // Home page
- if ($bits[0] == 'tag' || $bits[0] == 'admin') {
- // tag and admin pages always use system context
- // the contexts options don't make differences, so we use
- // page type patterns only
- $mform->addElement('hidden', 'bui_contexts', BUI_CONTEXTS_ENTIRE_SITE);
- } else {
- $contextoptions[BUI_CONTEXTS_FRONTPAGE_ONLY] = get_string('showonfrontpageonly', 'block');
- $contextoptions[BUI_CONTEXTS_FRONTPAGE_SUBS] = get_string('showonfrontpageandsubs', 'block');
- $contextoptions[BUI_CONTEXTS_ENTIRE_SITE] = get_string('showonentiresite', 'block');
- $mform->addElement('select', 'bui_contexts', get_string('contexts', 'block'), $contextoptions);
- $mform->addHelpButton('bui_contexts', 'contexts', 'block');
- }
+ // First of all, check if we are editing blocks @ front-page or no and
+ // make some dark magic if so (MDL-30340) because each page context
+ // implies one (and only one) harcoded page-type that will be set later
+ // when processing the form data at {@link block_manager::process_url_edit()}
+
+ // There are some conditions to check related to contexts
+ $ctxconditions = $this->page->context->contextlevel == CONTEXT_COURSE &&
+ $this->page->context->instanceid == get_site()->id;
+ // And also some pagetype conditions
+ $pageconditions = isset($bits[0]) && isset($bits[1]) && $bits[0] == 'site' && $bits[1] == 'index';
+ // So now we can be 100% sure if edition is happening at frontpage
+ $editingatfrontpage = $ctxconditions && $pageconditions;
+
+ // Let the form to know about that, can be useful later
+ $mform->addElement('hidden', 'bui_editingatfrontpage', (int)$editingatfrontpage);
+
+ // Front page, show the page-contexts element and set $pagetypelist to 'any page' (*)
+ // as unique option. Processign the form will do any change if needed
+ if ($editingatfrontpage) {
+ $contextoptions = array();
+ $contextoptions[BUI_CONTEXTS_FRONTPAGE_ONLY] = get_string('showonfrontpageonly', 'block');
+ $contextoptions[BUI_CONTEXTS_FRONTPAGE_SUBS] = get_string('showonfrontpageandsubs', 'block');
+ $contextoptions[BUI_CONTEXTS_ENTIRE_SITE] = get_string('showonentiresite', 'block');
+ $mform->addElement('select', 'bui_contexts', get_string('contexts', 'block'), $contextoptions);
+ $mform->addHelpButton('bui_contexts', 'contexts', 'block');
+ $pagetypelist['*'] = '*'; // This is not going to be shown ever, it's an unique option
+
+ // Any other system context block, hide the page-contexts element,
+ // it's always system-wide BUI_CONTEXTS_ENTIRE_SITE
+ } else if ($parentcontext->contextlevel == CONTEXT_SYSTEM) {
+ $mform->addElement('hidden', 'bui_contexts', BUI_CONTEXTS_ENTIRE_SITE);
+
} else if ($parentcontext->contextlevel == CONTEXT_COURSE) {
// 0 means display on current context only, not child contexts
// but if course managers select mod-* as pagetype patterns, block system will overwrite this option
@@ -126,12 +146,10 @@ function definition() {
$mform->addElement('select', 'bui_contexts', get_string('contexts', 'block'), $contextoptions);
}
- $displaypagetypewarning = false;
- if ($this->page->pagetype == 'site-index') { // No need for pagetype list on home page
- $pagetypelist = array('*'=>get_string('page-x', 'pagetype'));
- } else {
- // Generate pagetype patterns by callbacks
+ // Generate pagetype patterns by callbacks if necessary (has not been set specifically)
+ if (empty($pagetypelist)) {
$pagetypelist = generate_page_type_patterns($this->page->pagetype, $parentcontext, $this->page->context);
+ $displaypagetypewarning = false;
if (!array_key_exists($this->block->instance->pagetypepattern, $pagetypelist)) {
// Pushing block's existing page type pattern
$pagetypestringname = 'page-'.str_replace('*', 'x', $this->block->instance->pagetypepattern);
@@ -156,6 +174,25 @@ function definition() {
} else {
$value = array_pop(array_keys($pagetypelist));
$mform->addElement('hidden', 'bui_pagetypepattern', $value);
+ // Now we are really hiding a lot (both page-contexts and page-type-patterns),
+ // specially in some systemcontext pages having only one option (my/user...)
+ // so, until it's decided if we are going to add the 'bring-back' pattern to
+ // all those pages or no (see MDL-30574), we are going to show the unique
+ // element statically
+ // TODO: Revisit this once MDL-30574 has been decided and implemented, although
+ // perhaps it's not bad to always show this statically when only one pattern is
+ // available.
+ if (!$editingatfrontpage) {
+ // Try to beautify it
+ $strvalue = $value;
+ $strkey = 'page-'.str_replace('*', 'x', $strvalue);
+ if (get_string_manager()->string_exists($strkey, 'pagetype')) {
+ $strvalue = get_string($strkey, 'pagetype');
+ }
+ // Show as static (hidden has been set already)
+ $mform->addElement('static', 'bui_staticpagetypepattern',
+ get_string('restrictpagetypes','block'), $strvalue);
+ }
}
if ($this->page->subpage) {
View
3 blocks/html/db/upgrade.php
@@ -66,5 +66,8 @@ function xmldb_block_html_upgrade($oldversion) {
// Moodle v2.1.0 release upgrade line
// Put any upgrade step following this
+ // Moodle v2.2.0 release upgrade line
+ // Put any upgrade step following this
+
return true;
}
View
7 blocks/login/block_login.php
@@ -48,7 +48,12 @@ function get_content () {
$this->content->text .= '<input type="text" name="username" id="login_username" value="'.s($username).'" /></div>';
$this->content->text .= '<div class="c1 fld password"><label for="login_password">'.get_string('password').'</label>';
- $this->content->text .= '<input type="password" name="password" id="login_password" value="" /></div>';
+
+ if (!empty($CFG->loginpasswordautocomplete)) {
+ $this->content->text .= '<input type="password" name="password" id="login_password" value="" autocomplete="off" /></div>';
+ } else {
+ $this->content->text .= '<input type="password" name="password" id="login_password" value="" /></div>';
+ }
if (isset($CFG->rememberusername) and $CFG->rememberusername == 2) {
$checked = $username ? 'checked="checked"' : '';
View
3 blocks/navigation/db/upgrade.php
@@ -75,5 +75,8 @@ function xmldb_block_navigation_upgrade($oldversion, $block) {
// Moodle v2.1.0 release upgrade line
// Put any upgrade step following this
+ // Moodle v2.2.0 release upgrade line
+ // Put any upgrade step following this
+
return true;
}
View
3 blocks/settings/db/upgrade.php
@@ -75,5 +75,8 @@ function xmldb_block_settings_upgrade($oldversion, $block) {
// Moodle v2.1.0 release upgrade line
// Put any upgrade step following this
+ // Moodle v2.2.0 release upgrade line
+ // Put any upgrade step following this
+
return true;
}
View
30 course/format/scorm/version.php
@@ -0,0 +1,30 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Version details
+ *
+ * @package format
+ * @subpackage scorm
+ * @copyright 1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$plugin->version = 2011120100; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires = 2011120100; // Requires this Moodle version
+$plugin->component = 'format_scorm'; // Full name of the plugin (used for diagnostics)
View
30 course/format/social/version.php
@@ -0,0 +1,30 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Version details
+ *
+ * @package format
+ * @subpackage social
+ * @copyright 1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$plugin->version = 2011120100; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires = 2011120100; // Requires this Moodle version
+$plugin->component = 'format_social'; // Full name of the plugin (used for diagnostics)
View
30 course/format/topics/version.php
@@ -0,0 +1,30 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Version details
+ *
+ * @package format
+ * @subpackage topics
+ * @copyright 1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$plugin->version = 2011120100; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires = 2011120100; // Requires this Moodle version
+$plugin->component = 'format_topics'; // Full name of the plugin (used for diagnostics)
View
30 course/format/weeks/version.php
@@ -0,0 +1,30 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Version details
+ *
+ * @package format
+ * @subpackage weeks
+ * @copyright 1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$plugin->version = 2011120100; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires = 2011120100; // Requires this Moodle version
+$plugin->component = 'format_weeks'; // Full name of the plugin (used for diagnostics)
View
3 enrol/authorize/db/upgrade.php
@@ -96,5 +96,8 @@ function xmldb_enrol_authorize_upgrade($oldversion) {
// Moodle v2.1.0 release upgrade line
// Put any upgrade step following this
+ // Moodle v2.2.0 release upgrade line
+ // Put any upgrade step following this
+
return true;
}
View
3 enrol/database/db/upgrade.php
@@ -39,5 +39,8 @@ function xmldb_enrol_database_upgrade($oldversion) {
}
+ // Moodle v2.2.0 release upgrade line
+ // Put any upgrade step following this
+
return true;
}
View
2 enrol/database/lib.php
@@ -185,7 +185,7 @@ public function sync_user_enrolments($user) {
$existing = array();
foreach ($current as $r) {
- if (in_array($r->id, $roles)) {
+ if (in_array($r->roleid, $roles)) {
$existing[$r->roleid] = $r->roleid;
} else {
role_unassign($r->roleid, $user->id, $context->id, 'enrol_database', $instance->id);
View
2 enrol/flatfile/db/upgrade.php
@@ -62,6 +62,8 @@ function xmldb_enrol_flatfile_upgrade($oldversion) {
upgrade_plugin_savepoint(true, 2010091400, 'enrol', 'flatfile');
}
+ // Moodle v2.2.0 release upgrade line
+ // Put any upgrade step following this
return $result;
}
View
46 enrol/guest/db/upgrade.php
@@ -0,0 +1,46 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This file keeps track of upgrades to the guest enrolment plugin
+ *
+ * @package enrol
+ * @subpackage guest
+ * @copyright 2011 Petr Skoda {@link http://skodak.org
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+function xmldb_enrol_guest_upgrade($oldversion) {
+ global $CFG, $DB, $OUTPUT;
+
+ $dbman = $DB->get_manager();
+
+ // Moodle v2.2.0 release upgrade line
+ // Put any upgrade step following this
+
+ if ($oldversion < 2011112901) {
+ // convert all null passwords to empty strings
+ $DB->set_field('enrol', 'password', '', array('enrol'=>'guest', 'password'=>null));
+
+ upgrade_plugin_savepoint(true, 2011112901, 'enrol', 'guest');
+ }
+
+ return true;
+}
+
+
View
16 enrol/guest/lib.php
@@ -328,6 +328,22 @@ public function course_updated($inserted, $course, $data) {
}
/**
+ * Add new instance of enrol plugin.
+ * @param object $course
+ * @param array instance fields
+ * @return int id of new instance, null if can not be created
+ */
+ public function add_instance($course, array $fields = NULL) {
+ $fields = (array)$fields;
+
+ if (!isset($fields['password'])) {
+ $fields['password'] = '';
+ }
+
+ return parent::add_instance($course, $fields);
+ }
+
+ /**
* Add new instance of enrol plugin with default settings.
* @param object $course
* @return int id of new instance
View
2 enrol/guest/version.php
@@ -25,6 +25,6 @@
defined('MOODLE_INTERNAL') || die();
-$plugin->version = 2011112900; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->version = 2011112901; // The current plugin version (Date: YYYYMMDDXX)
$plugin->requires = 2011112900; // Requires this Moodle version
$plugin->component = 'enrol_guest'; // Full name of the plugin (used for diagnostics)
View
3 enrol/imsenterprise/db/upgrade.php
@@ -83,6 +83,9 @@ function xmldb_enrol_imsenterprise_upgrade($oldversion) {
// Moodle v2.1.0 release upgrade line
// Put any upgrade step following this
+ // Moodle v2.2.0 release upgrade line
+ // Put any upgrade step following this
+
return true;
}
View
4 enrol/imsenterprise/lib.php
@@ -403,6 +403,10 @@ function process_group_tag($tagcontents) {
$courseid = $DB->insert_record('course', $course);
+ // Setup default enrolment plugins
+ $course->id = $courseid;
+ enrol_course_updated(true, $course, null);
+
// Setup the blocks
$course = $DB->get_record('course', array('id' => $courseid));
blocks_add_default_course_blocks($course);
View
3 enrol/mnet/db/upgrade.php
@@ -39,5 +39,8 @@ function xmldb_enrol_mnet_upgrade($oldversion) {
// Moodle v2.1.0 release upgrade line
// Put any upgrade step following this
+ // Moodle v2.2.0 release upgrade line
+ // Put any upgrade step following this
+
return true;
}
View
3 enrol/paypal/db/upgrade.php
@@ -62,5 +62,8 @@ function xmldb_enrol_paypal_upgrade($oldversion) {
// Moodle v2.1.0 release upgrade line
// Put any upgrade step following this
+ // Moodle v2.2.0 release upgrade line
+ // Put any upgrade step following this
+
return true;
}
View
0 filter/emailprotect/vesion.php → filter/emailprotect/version.php
File renamed without changes.
View
3 filter/mediaplugin/db/upgrade.php
@@ -46,5 +46,8 @@ function xmldb_filter_mediaplugin_upgrade($oldversion) {
// Moodle v2.1.0 release upgrade line
// Put any upgrade step following this
+ // Moodle v2.2.0 release upgrade line
+ // Put any upgrade step following this
+
return true;
}
View
3 filter/tex/db/upgrade.php
@@ -41,5 +41,8 @@ function xmldb_filter_tex_upgrade($oldversion) {
// Moodle v2.1.0 release upgrade line
// Put any upgrade step following this
+ // Moodle v2.2.0 release upgrade line
+ // Put any upgrade step following this
+
return true;
}
View
3 grade/grading/form/rubric/db/upgrade.php
@@ -35,5 +35,8 @@ function xmldb_gradingform_rubric_upgrade($oldversion) {
$dbman = $DB->get_manager();
+ // Moodle v2.2.0 release upgrade line
+ // Put any upgrade step following this
+
return true;
}
View
2 grade/report/user/index.php
@@ -103,7 +103,7 @@
if ($user_selector) {
$renderer = $PAGE->get_renderer('gradereport_user');
- echo $renderer->graded_users_selector('user', $course, $userid, $currentgroup, false);
+ echo $renderer->graded_users_selector('user', $course, $userid, $currentgroup, true);
}
while ($userdata = $gui->next_user()) {
View
2 index.php
@@ -58,7 +58,7 @@
// Redirect logged-in users to My Moodle overview if required
if (optional_param('setdefaulthome', false, PARAM_BOOL)) {
set_user_preference('user_home_page_preference', HOMEPAGE_SITE);
- } else if ($CFG->defaulthomepage == HOMEPAGE_MY && (optional_param('redirect', true, PARAM_BOOL) || !$hassiteconfig)) {
+ } else if ($CFG->defaulthomepage == HOMEPAGE_MY && optional_param('redirect', 1, PARAM_BOOL) === 1) {
redirect($CFG->wwwroot .'/my/');
} else if (!empty($CFG->defaulthomepage) && $CFG->defaulthomepage == HOMEPAGE_USER) {
$PAGE->settingsnav->get('usercurrentsettings')->add(get_string('makethismyhome'), new moodle_url('/', array('setdefaulthome'=>true)), navigation_node::TYPE_SETTING);
View
2 install/lang/af/admin.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/af/langconfig.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/am/install.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/am/langconfig.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/am/moodle.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/ar/admin.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/ar/error.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/ar/install.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/ar/langconfig.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/ar/moodle.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/ast/admin.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/ast/error.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/ast/install.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/ast/langconfig.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/ast/moodle.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/az/admin.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/az/error.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/az/install.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/az/langconfig.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/be/langconfig.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/be/moodle.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/bg/admin.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/bg/error.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/bg/install.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/bg/langconfig.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/bg/moodle.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/bn/admin.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/bn/install.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/bn/langconfig.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/bn/moodle.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/bs/install.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/bs/langconfig.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/ca/admin.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/ca/error.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/ca/install.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/ca/langconfig.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/ca/moodle.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/ckb/langconfig.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/cs/admin.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/cs/error.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
4 install/lang/cs/install.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
@@ -34,12 +34,14 @@
$string['availablelangs'] = 'Dostupné jazykové balíčky';
$string['chooselanguagehead'] = 'Vyberte jazyk';
$string['chooselanguagesub'] = 'Zvolte si jazyk tohoto průvodce instalací. Vybraný jazyk bude též nastaven jako výchozí jazyk stránek, ale to půjde případně později změnit.';
+$string['clialreadyconfigured'] = 'Soubor config.php již existuje. Spusťte admin/cli/install_database.php, pokud chcete provést instalaci databáze.';
$string['clialreadyinstalled'] = 'Soubor config.php již existuje. Spusťte admin/cli/upgrade.php, pokud chcete provést upgrade vašich stránek.';
$string['cliinstallheader'] = 'Moodle {$a} - průvodce instalací z příkazové řádky';
$string['databasehost'] = 'Databázový server';
$string['databasename'] = 'Název databáze';
$string['databasetypehead'] = 'Vyberte databázový ovladač';
$string['dataroot'] = 'Datový adresář';
+$string['datarootpermission'] = 'Přístupová práva k datovému adresáři';
$string['dbprefix'] = 'Předpona tabulek';
$string['dirroot'] = 'Adresář Moodlu';
$string['environmenthead'] = 'Kontrola programového prostředí...';
View
2 install/lang/cs/langconfig.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/cs/moodle.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/cy/admin.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/cy/error.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2 install/lang/cy/install.php
@@ -16,7 +16,7 @@
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
/**
- * Automatically generated strings for Moodle 2.2beta installer
+ * Automatically generated strings for Moodle 2.3dev installer
*
* Do not edit this file manually! It contains just a subset of strings
* needed during the very first steps of installation. This file was
View
2