diff options
| -rw-r--r-- | core/controllers/scaffold.php (renamed from core/controllers/welcome.php) | 54 | ||||
| -rw-r--r-- | core/helpers/core_menu.php | 4 | ||||
| -rw-r--r-- | core/views/scaffold.html.php (renamed from core/views/welcome.html.php) | 46 | ||||
| -rw-r--r-- | core/views/scaffold_syscheck.html.php (renamed from core/views/welcome_syscheck.html.php) | 10 |
4 files changed, 57 insertions, 57 deletions
diff --git a/core/controllers/welcome.php b/core/controllers/scaffold.php index d11c2c42..8266ba8f 100644 --- a/core/controllers/welcome.php +++ b/core/controllers/scaffold.php @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -class Welcome_Controller extends Template_Controller { - public $template = "welcome.html"; +class Scaffold_Controller extends Template_Controller { + public $template = "scaffold.html"; function index() { try { @@ -26,11 +26,11 @@ class Welcome_Controller extends Template_Controller { } catch (Exception $e) { } - $this->template->syscheck = new View("welcome_syscheck.html"); + $this->template->syscheck = new View("scaffold_syscheck.html"); $this->template->syscheck->errors = $this->_get_config_errors(); $this->template->syscheck->modules = array(); - set_error_handler(array("Welcome_Controller", "_error_handler")); + set_error_handler(array("Scaffold_Controller", "_error_handler")); try { $this->template->syscheck->modules = module::available(); $this->template->album_count = ORM::factory("item")->where("type", "album")->count_all(); @@ -83,7 +83,7 @@ class Welcome_Controller extends Template_Controller { } if ($redirect) { - url::redirect("welcome"); + url::redirect("scaffold"); } } @@ -92,7 +92,7 @@ class Welcome_Controller extends Template_Controller { if ($module_name == "core") { // We have to uninstall all other modules first, else their tables, etc don't // get cleaned up. - $old_handler = set_error_handler(array("Welcome_Controller", "_error_handler")); + $old_handler = set_error_handler(array("scaffold_Controller", "_error_handler")); try { foreach (ORM::factory("module")->find_all() as $module) { if ($module->name != "core" && $module->version) { @@ -120,7 +120,7 @@ class Welcome_Controller extends Template_Controller { module::uninstall($module_name); } if ($redirect) { - url::redirect("welcome"); + url::redirect("scaffold"); } } @@ -167,7 +167,7 @@ class Welcome_Controller extends Template_Controller { fwrite($fp, var_export($t, 1)); fwrite($fp, ";"); fclose($fp); - url::redirect("welcome"); + url::redirect("scaffold"); break; case "run": @@ -214,7 +214,7 @@ class Welcome_Controller extends Template_Controller { html::anchor("albums/$parent_id", "View album")); } - url::redirect("welcome"); + url::redirect("scaffold"); } function add_albums_and_photos($count, $desired_type=null) { @@ -255,7 +255,7 @@ class Welcome_Controller extends Template_Controller { if ($album_count > 0) { log::success("content", "(scaffold) Added $album_count albums"); } - url::redirect("welcome"); + url::redirect("scaffold"); } function random_phrase($count) { @@ -299,7 +299,7 @@ class Welcome_Controller extends Template_Controller { $users = ORM::factory("user")->find_all()->as_array(); if (empty($photos)) { - url::redirect("welcome"); + url::redirect("scaffold"); } if (module::is_installed("akismet")) { @@ -315,7 +315,7 @@ class Welcome_Controller extends Template_Controller { $guest_name, $guest_email, $guest_url); } - url::redirect("welcome"); + url::redirect("scaffold"); } function add_tags($count) { @@ -332,7 +332,7 @@ class Welcome_Controller extends Template_Controller { } } - url::redirect("welcome"); + url::redirect("scaffold"); } private function _generateTags($number){ @@ -364,7 +364,7 @@ class Welcome_Controller extends Template_Controller { public function session($key) { Session::instance()->set($key, $this->input->get("value", false)); $this->auto_render = false; - url::redirect("welcome"); + url::redirect("scaffold"); } private function _get_config_errors() { @@ -397,7 +397,7 @@ class Welcome_Controller extends Template_Controller { $error->message2 = "Then edit this file and enter your database configuration settings."; $errors[] = $error; } else { - $old_handler = set_error_handler(array("Welcome_Controller", "_error_handler")); + $old_handler = set_error_handler(array("Scaffold_Controller", "_error_handler")); try { Database::instance()->connect(); } catch (Exception $e) { @@ -483,7 +483,7 @@ class Welcome_Controller extends Template_Controller { "media_rss", "search", "slideshow", "tag") as $module_name) { $this->install($module_name, false); } - url::redirect("welcome/dump_database"); + url::redirect("scaffold/dump_database"); } public function dump_database() { @@ -514,7 +514,7 @@ class Welcome_Controller extends Template_Controller { print implode("\n", $output); return; } - url::redirect("welcome/dump_var"); + url::redirect("scaffold/dump_var"); } public function dump_var() { @@ -550,7 +550,7 @@ class Welcome_Controller extends Template_Controller { } } fclose($fd); - url::redirect("welcome"); + url::redirect("scaffold"); } public function add_user() { @@ -561,23 +561,23 @@ class Welcome_Controller extends Template_Controller { $user->admin = true; $user->save(); } - url::redirect("welcome"); + url::redirect("scaffold"); } public function delete_user($id) { ORM::factory("user", $id)->delete(); - url::redirect("welcome"); + url::redirect("scaffold"); } public function add_group() { $name = $this->input->post("group_name"); group::create($name); - url::redirect("welcome"); + url::redirect("scaffold"); } public function delete_group($id) { ORM::factory("group", $id)->delete(); - url::redirect("welcome"); + url::redirect("scaffold"); } public function remove_from_group($group_id, $user_id) { @@ -587,7 +587,7 @@ class Welcome_Controller extends Template_Controller { $group->remove($user); $group->save(); } - url::redirect("welcome"); + url::redirect("scaffold"); } public function add_to_group($user_id) { @@ -598,7 +598,7 @@ class Welcome_Controller extends Template_Controller { $group->add($user); $group->save(); } - url::redirect("welcome"); + url::redirect("scaffold"); } private function _load_album_tree() { @@ -616,12 +616,12 @@ class Welcome_Controller extends Template_Controller { public function add_perm($group_id, $perm, $item_id) { access::allow(ORM::factory("group", $group_id), $perm, ORM::factory("item", $item_id)); - url::redirect("welcome"); + url::redirect("scaffold"); } public function deny_perm($group_id, $perm, $item_id) { access::deny(ORM::factory("group", $group_id), $perm, ORM::factory("item", $item_id)); - url::redirect("welcome"); + url::redirect("scaffold"); } public function reset_all_perms($group_id, $item_id) { @@ -630,7 +630,7 @@ class Welcome_Controller extends Template_Controller { foreach (ORM::factory("permission")->find_all() as $perm) { access::reset($group, $perm->name, $item); } - url::redirect("welcome"); + url::redirect("scaffold"); } public function form($arg1, $arg2) { diff --git a/core/helpers/core_menu.php b/core/helpers/core_menu.php index 6d6d93f4..1564e4d4 100644 --- a/core/helpers/core_menu.php +++ b/core/helpers/core_menu.php @@ -19,11 +19,11 @@ */ class core_menu_Core { static function site($menu, $theme) { - if (file_exists(APPPATH . "controllers/welcome.php")) { + if (file_exists(APPPATH . "controllers/scaffold.php")) { $menu->append(Menu::factory("link") ->id("browse") ->label("Scaffold") - ->url(url::site("welcome"))); + ->url(url::site("scaffold"))); } $menu->append(Menu::factory("link") ->id("home") diff --git a/core/views/welcome.html.php b/core/views/scaffold.html.php index e927462b..2dd256c2 100644 --- a/core/views/welcome.html.php +++ b/core/views/scaffold.html.php @@ -248,35 +248,35 @@ <p> add: [ <? foreach (array(1, 10, 50, 100, 500, 1000) as $count): ?> - <?= html::anchor("welcome/add_albums_and_photos/$count", "$count") ?> + <?= html::anchor("scaffold/add_albums_and_photos/$count", "$count") ?> <? endforeach ?> ] photos and albums </p> <p> add: [ <? foreach (array(1, 10, 50, 100, 500, 1000) as $count): ?> - <?= html::anchor("welcome/add_albums_and_photos/$count/album", "$count") ?> + <?= html::anchor("scaffold/add_albums_and_photos/$count/album", "$count") ?> <? endforeach ?> ] albums only </p> <p> add: [ <? foreach (array(1, 10, 50, 100, 500, 1000) as $count): ?> - <?= html::anchor("welcome/add_comments/$count", "$count") ?> + <?= html::anchor("scaffold/add_comments/$count", "$count") ?> <? endforeach ?> ] comments </p> <p> add: [ <? foreach (array(1, 10, 50, 100, 500, 1000) as $count): ?> - <?= html::anchor("welcome/add_tags/$count", "$count") ?> + <?= html::anchor("scaffold/add_tags/$count", "$count") ?> <? endforeach ?> ] tags </p> <?= $add_photo_html ?> <fieldset> <legend>Server Side Photos</legend> - <form method="post" action="<?= url::site("welcome/add_photos") ?>"> + <form method="post" action="<?= url::site("scaffold/add_photos") ?>"> <input type="submit" value="upload"/> <input type="text" name="path" size="70" value="<?= cookie::get("add_photos_path") ?>" /> @@ -294,7 +294,7 @@ </fieldset> <fieldset> <legend>Packaging</legend> - <a href="<?= url::site("welcome/package") ?>">Make Package</a> + <a href="<?= url::site("scaffold/package") ?>">Make Package</a> </fieldset> </div> @@ -312,19 +312,19 @@ <li> <?= $user->name ?> <? if (!$user->admin): ?> - <?= html::anchor("welcome/delete_user/$user->id", "[x]") ?> + <?= html::anchor("scaffold/delete_user/$user->id", "[x]") ?> <? endif ?> <ul> <? foreach ($user->groups as $group): ?> <li> <?= $group->name ?> <? if (!$group->special): ?> - <?= html::anchor("welcome/remove_from_group/$group->id/$user->id", "[x]") ?> + <?= html::anchor("scaffold/remove_from_group/$group->id/$user->id", "[x]") ?> <? endif ?> </li> <? endforeach ?> <li> - <form method="post" action="<?= url::site("welcome/add_to_group/$user->id") ?>"> + <form method="post" action="<?= url::site("scaffold/add_to_group/$user->id") ?>"> <input type="text" name="group_name"/> </form> </li> @@ -334,7 +334,7 @@ </ul> <fieldset> <legend>Add User</legend> - <form method="post" action="<?= url::site("welcome/add_user") ?>"> + <form method="post" action="<?= url::site("scaffold/add_user") ?>"> <input name="user_name" type="text"/> <input type="submit" value="create"/> <input type="checkbox" name="admin"/> Admin @@ -348,14 +348,14 @@ <li> <?= $group->name ?> <? if (!$group->special): ?> - <?= html::anchor("welcome/delete_group/$group->id", "[x]") ?> + <?= html::anchor("scaffold/delete_group/$group->id", "[x]") ?> <? endif ?> </li> <? endforeach ?> </ul> <fieldset> <legend>Add Group</legend> - <form method="post" action="<?= url::site("welcome/add_group") ?>"> + <form method="post" action="<?= url::site("scaffold/add_group") ?>"> <input name="group_name" type="text"/> <input type="submit" value="create"/> </form> @@ -377,14 +377,14 @@ <? foreach (array("view", "view_full", "edit") as $perm): ?> <?= $perm != "view" ? " ---- " : "" ?> <? if (access::group_can(group::everybody(), $perm, $current->album)): ?> - <?= html::anchor("welcome/deny_perm/1/$perm/{$current->album->id}", strtoupper($perm), array("class" => "allowed")) ?> + <?= html::anchor("scaffold/deny_perm/1/$perm/{$current->album->id}", strtoupper($perm), array("class" => "allowed")) ?> <? else: ?> - <?= html::anchor("welcome/add_perm/1/$perm/{$current->album->id}", strtolower($perm), array("class" => "denied")) ?> + <?= html::anchor("scaffold/add_perm/1/$perm/{$current->album->id}", strtolower($perm), array("class" => "denied")) ?> <? endif ?> <? endforeach ?> <? if ($current->album->id != 1): ?> <span class="understate"> - (<?= html::anchor("welcome/reset_all_perms/1/{$current->album->id}", "reset") ?>) + (<?= html::anchor("scaffold/reset_all_perms/1/{$current->album->id}", "reset") ?>) </span> <? endif; ?> <? $stack[] = "CLOSE"; ?> @@ -403,9 +403,9 @@ <div id="info" class="activity"> <ul> - <li> <?= html::anchor("welcome/mptt?type=text", "MPTT tree (text)") ?> </li> + <li> <?= html::anchor("scaffold/mptt?type=text", "MPTT tree (text)") ?> </li> <li> - <?= html::anchor("welcome/mptt", "MPTT tree (graph)") ?> + <?= html::anchor("scaffold/mptt", "MPTT tree (graph)") ?> <i>(requires /usr/bin/dot from the graphviz package)</i> </li> <? if ($deepest_photo): ?> @@ -428,16 +428,16 @@ <? endif ?> <li> Profiling: <? if (Session::instance()->get("profiler", false)): ?> - <b>on</b> <?= html::anchor("welcome/session/profiler?value=0", "off") ?> + <b>on</b> <?= html::anchor("scaffold/session/profiler?value=0", "off") ?> <? else: ?> - <?= html::anchor("welcome/session/profiler?value=1", "on") ?> <b>off</b> + <?= html::anchor("scaffold/session/profiler?value=1", "on") ?> <b>off</b> <? endif ?> </li> <li> Debug: <? if (Session::instance()->get("debug", false)): ?> - <b>on</b> <?= html::anchor("welcome/session/debug?value=0", "off") ?> + <b>on</b> <?= html::anchor("scaffold/session/debug?value=0", "off") ?> <? else: ?> - <?= html::anchor("welcome/session/debug?value=1", "on") ?> <b>off</b> + <?= html::anchor("scaffold/session/debug?value=1", "on") ?> <b>off</b> <? endif ?> </li> </ul> @@ -446,10 +446,10 @@ <div id="benchmarks" class="activity"> <ul> <li> - <?= html::anchor("welcome/i18n/build", "Make Translation") ?> + <?= html::anchor("scaffold/i18n/build", "Make Translation") ?> </li> <li> - <?= html::anchor("welcome/i18n/run", "Run Translation") ?> + <?= html::anchor("scaffold/i18n/run", "Run Translation") ?> </li> </ul> </div> diff --git a/core/views/welcome_syscheck.html.php b/core/views/scaffold_syscheck.html.php index 51f87db5..7dbb4b9f 100644 --- a/core/views/welcome_syscheck.html.php +++ b/core/views/scaffold_syscheck.html.php @@ -23,7 +23,7 @@ Your system is ready, but Gallery is not yet installed. </p> <p> - <?= html::anchor("welcome/install/core", "install gallery") ?> + <?= html::anchor("scaffold/install/core", "install gallery") ?> </p> <? else: ?> <p class="success"> @@ -40,7 +40,7 @@ <td> <b> core </b> </td> <td> <b> <?= module::get_version("core") ?> </b> </td> <td> <b> <?= module::get_version("core") ?> </b> </td> - <td> <b> <?= html::anchor("welcome/uninstall/core", "reset install") ?> </b> </td> + <td> <b> <?= html::anchor("scaffold/uninstall/core", "reset install") ?> </b> </td> </tr> <? foreach ($modules as $module_name => $info): ?> <? if ($module_name == "core") continue; ?> @@ -50,16 +50,16 @@ <td><?= $info->version ?></td> <td> <? if ($info->installed): ?> - <?= html::anchor("welcome/uninstall/{$module_name}", "uninstall") ?> + <?= html::anchor("scaffold/uninstall/{$module_name}", "uninstall") ?> <? else: ?> - <?= html::anchor("welcome/install/{$module_name}", "install") ?> + <?= html::anchor("scaffold/install/{$module_name}", "install") ?> <? endif ?> </td> </tr> <? endforeach; ?> <tr> <td colspan="3" align="center"> - <button onclick="document.location.href='<?= url::site("welcome/install/*") ?>'">Install All Plugins</button> + <button onclick="document.location.href='<?= url::site("scaffold/install/*") ?>'">Install All Plugins</button> </td> </tr> </table> |