diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/controllers/welcome.php | 21 | ||||
| -rw-r--r-- | core/views/welcome.html.php | 12 | ||||
| -rw-r--r-- | core/views/welcome_syscheck.html.php | 9 |
3 files changed, 32 insertions, 10 deletions
diff --git a/core/controllers/welcome.php b/core/controllers/welcome.php index cf8f6693..80aa2f8c 100644 --- a/core/controllers/welcome.php +++ b/core/controllers/welcome.php @@ -42,21 +42,21 @@ class Welcome_Controller extends Template_Controller { } function install($module_name) { - call_user_func(array("{$module_name}_installer", "install")); + if ($module_name == "*") { + foreach ($this->_read_modules() as $module_name => $version) { + if (empty($version)) { + call_user_func(array("${module_name}_installer", "install")); + } + } + } else { + call_user_func(array("{$module_name}_installer", "install")); + } + url::redirect("welcome"); } function uninstall($module_name) { if ($module_name == "core") { - // Legacy support for uninstalling the auth module and removing the blocks table - try { - $db = Database::instance(); - $db->query("DROP TABLE IF EXISTS `passwords`;"); - ORM::factory("module")->where("name", "auth")->find()->delete(); - $db->query("DROP TABLE IF EXISTS `blocks`;"); - } catch (Exception $e) { - } - // We have to uninstall all other modules first, else their tables, etc don't // get cleaned up. foreach (ORM::factory("module")->find_all() as $module) { @@ -292,6 +292,7 @@ class Welcome_Controller extends Template_Controller { } catch (Exception $e) { // The database may not be installed } + ksort($modules); return $modules; } } diff --git a/core/views/welcome.html.php b/core/views/welcome.html.php index a3f70d33..41578935 100644 --- a/core/views/welcome.html.php +++ b/core/views/welcome.html.php @@ -106,6 +106,18 @@ display: inline; } + tr.core td { + border-bottom: 1px solid black; + + } + + a { + text-decoration: none; + } + + a:hover { + text-decoration: underline; + } </style> <script type="text/javascript" src="<?= url::file("lib/jquery.js") ?>"></script> <script type="text/javascript" src="<?= url::file("lib/jquery.cookie.js") ?>"></script> diff --git a/core/views/welcome_syscheck.html.php b/core/views/welcome_syscheck.html.php index 7d972689..e469a724 100644 --- a/core/views/welcome_syscheck.html.php +++ b/core/views/welcome_syscheck.html.php @@ -35,7 +35,13 @@ <th align="left">Version</th> <th align="left">Action</th> </tr> + <tr class="core"> + <td> <b> core </b> </td> + <td> <b> <?= $modules["core"] ?> </b> </td> + <td> <b> <?= html::anchor("welcome/uninstall/core", "reset install") ?> </b> </td> + </tr> <? foreach ($modules as $module_name => $module_version): ?> + <? if ($module_name == "core") continue; ?> <tr> <td><?= $module_name ?></td> <td><?= empty($module_version) ? "" : $module_version ?></td> @@ -49,6 +55,9 @@ </tr> <? endforeach; ?> <tr> + <td colspan="3" align="center"> + <button onclick="document.location.href='<?= url::site("welcome/install/*") ?>'">Install All Plugins</button> + </td> </tr> </table> <? endif; ?> |