From b2661f317eebc4ebeef19540a87cc39f149a0eb8 Mon Sep 17 00:00:00 2001
From: cash
";
+} else {
+ $buttons = '';
+}
+
+$buttons .= $category_form;
+
+// construct page header
+?>
+
+ $foo) {
+ if ($key > $max) $max = $key;
+}
+
+// Display list of plugins
+$n = 0;
+foreach ($installed_plugins as $plugin => $data) {
+ echo elgg_view('admin/components/plugin', array(
+ 'plugin' => $plugin,
+ 'details' => $data,
+ 'maxorder' => $max,
+ 'order' => array_search($plugin, $plugin_list)
+ ));
+ $n++;
+}
+?>
+
\ No newline at end of file
diff --git a/views/default/admin/plugins/plugins_advanced.php b/views/default/admin/plugins/plugins_advanced.php
deleted file mode 100644
index ead930090..000000000
--- a/views/default/admin/plugins/plugins_advanced.php
+++ /dev/null
@@ -1,106 +0,0 @@
- $plugin) {
- $plugin_categories = $plugin['manifest']['category'];
-
- // handle plugins that don't declare categories
- if ((!$plugin_categories && $show_category) || ($show_category && !in_array($show_category, $plugin_categories))) {
- unset($installed_plugins[$id]);
- }
-
- if (isset($plugin_categories)) {
- foreach ($plugin_categories as $category) {
- if (!array_key_exists($category, $categories)) {
- $categories[$category] = elgg_echo("admin:plugins:label:moreinfo:categories:$category");
- }
- }
- }
-}
-
-$ts = time();
-$token = generate_action_token($ts);
-$categories = array_merge(array('' => elgg_echo('admin:plugins:categories:all')), $categories);
-
-$category_pulldown = elgg_view('input/pulldown', array(
- 'internalname' => 'category',
- 'options_values' => $categories,
- 'value' => $show_category
-));
-
-$category_button = elgg_view('input/submit', array(
- 'value' => elgg_echo('filter'),
- 'class' => 'elgg-action-button'
-));
-
-$category_form = elgg_view('input/form', array(
- 'body' => $category_pulldown . $category_button
-));
-
-// Page Header elements
-$title = elgg_view_title(elgg_echo('admin:plugins'));
-
-// @todo Until "en/disable all" means "All plugins on this page" hide when not looking at all.
-if (!isset($show_category) || empty($show_category)) {
- $buttons = "url}action/admin/plugins/enableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('enableall')." url}action/admin/plugins/disableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('disableall')." ";
- $buttons .= "
";
-} else {
- $buttons = '';
-}
-
-$buttons .= $category_form;
-
-// construct page header
-?>
-
- $foo) {
- if ($key > $max) $max = $key;
-}
-
-// Display list of plugins
-$n = 0;
-foreach ($installed_plugins as $plugin => $data) {
- echo elgg_view('admin/components/plugin', array(
- 'plugin' => $plugin,
- 'details' => $data,
- 'maxorder' => $max,
- 'order' => array_search($plugin, $plugin_list)
- ));
- $n++;
-}
-?>
-
\ No newline at end of file
diff --git a/views/default/admin/plugins/plugins_simple.php b/views/default/admin/plugins/plugins_simple.php
deleted file mode 100644
index e53ecb0c1..000000000
--- a/views/default/admin/plugins/plugins_simple.php
+++ /dev/null
@@ -1,94 +0,0 @@
- $plugin) {
- if (!isset($plugin['manifest']['admin_interface']) || $plugin['manifest']['admin_interface'] == 'advanced') {
- continue;
- }
-
- $plugin['installed_name'] = $installed_name;
-
- $plugin_list[$plugin['manifest']['name']] = $plugin;
-}
-
-ksort($plugin_list);
-$form_body .= <<<___END
-
-___END;
-
-foreach ($plugin_list as $name => $info) {
- $manifest = $info['manifest'];
- $version_valid = (isset($manifest['elgg_version'])) ? check_plugin_compatibility($manifest['elgg_version']) : FALSE;
- if ($info['active']) {
- $active_class = 'active';
- $checked = 'checked="checked"';
- } else {
- $active_class = 'not_active';
- $checked = '';
- }
-
- $author = $link = $version = $settings = '';
-
- if (isset($manifest['author'])) {
- $author = elgg_echo('admin:plugins:author', array($manifest['author']));
- }
-
- if (isset($manifest['version'])) {
- $version = ' | ' . elgg_echo('admin:plugins:version', array($manifest['version']));
- }
-
- if (isset($manifest['website'])) {
- $link = " | " . elgg_echo('admin:plugins:plugin_website') . '';
- }
-
- if (elgg_view_exists("settings/{$info['installed_name']}/edit")) {
- $settings_href = elgg_get_site_url()."pg/admin/plugin_settings/{$info['installed_name']}";
- $settings = " | ". elgg_echo('settings') ."";
- }
-
- $form_body .= <<<___END
-
';
-$form_body .= elgg_view('input/submit', array('value' => elgg_echo('save')));
-$form_body .= elgg_view('input/reset', array('value' => elgg_echo('reset'), 'class' => 'elgg-action-button disabled'));
-
-echo elgg_view('input/form', array(
- 'action' => "action/admin/plugins/simple_update_states",
- 'body' => $form_body,
- 'class' => 'admin_plugins_simpleview'
-));
\ No newline at end of file
diff --git a/views/default/admin/plugins/simple.php b/views/default/admin/plugins/simple.php
new file mode 100644
index 000000000..e53ecb0c1
--- /dev/null
+++ b/views/default/admin/plugins/simple.php
@@ -0,0 +1,94 @@
+ $plugin) {
+ if (!isset($plugin['manifest']['admin_interface']) || $plugin['manifest']['admin_interface'] == 'advanced') {
+ continue;
+ }
+
+ $plugin['installed_name'] = $installed_name;
+
+ $plugin_list[$plugin['manifest']['name']] = $plugin;
+}
+
+ksort($plugin_list);
+$form_body .= <<<___END
+
+___END;
+
+foreach ($plugin_list as $name => $info) {
+ $manifest = $info['manifest'];
+ $version_valid = (isset($manifest['elgg_version'])) ? check_plugin_compatibility($manifest['elgg_version']) : FALSE;
+ if ($info['active']) {
+ $active_class = 'active';
+ $checked = 'checked="checked"';
+ } else {
+ $active_class = 'not_active';
+ $checked = '';
+ }
+
+ $author = $link = $version = $settings = '';
+
+ if (isset($manifest['author'])) {
+ $author = elgg_echo('admin:plugins:author', array($manifest['author']));
+ }
+
+ if (isset($manifest['version'])) {
+ $version = ' | ' . elgg_echo('admin:plugins:version', array($manifest['version']));
+ }
+
+ if (isset($manifest['website'])) {
+ $link = " | " . elgg_echo('admin:plugins:plugin_website') . '';
+ }
+
+ if (elgg_view_exists("settings/{$info['installed_name']}/edit")) {
+ $settings_href = elgg_get_site_url()."pg/admin/plugin_settings/{$info['installed_name']}";
+ $settings = " | ". elgg_echo('settings') ."";
+ }
+
+ $form_body .= <<<___END
+
';
+$form_body .= elgg_view('input/submit', array('value' => elgg_echo('save')));
+$form_body .= elgg_view('input/reset', array('value' => elgg_echo('reset'), 'class' => 'elgg-action-button disabled'));
+
+echo elgg_view('input/form', array(
+ 'action' => "action/admin/plugins/simple_update_states",
+ 'body' => $form_body,
+ 'class' => 'admin_plugins_simpleview'
+));
\ No newline at end of file
diff --git a/views/default/admin/site/advanced.php b/views/default/admin/site/advanced.php
new file mode 100644
index 000000000..048ffa883
--- /dev/null
+++ b/views/default/admin/site/advanced.php
@@ -0,0 +1,67 @@
+";
+ $form_body .= elgg_echo('installation:' . $field) . "
";
+ $warning = elgg_echo('installation:warning:' . $field);
+ if ($warning != 'installation:warning:' . $field) echo "" . $warning . "
";
+ $value = $vars['config']->$field;
+ $form_body .= elgg_view("input/text",array('internalname' => $field, 'value' => $value));
+ $form_body .= "
" . elgg_echo('admin:site:access:warning') . "
";
+$form_body .= elgg_echo('installation:sitepermissions') . elgg_view('input/access', array('internalname' => 'default_access','value' => $vars['config']->default_access)) . "
" . elgg_echo('installation:allow_user_default_access:description') . "
" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:allow_user_default_access:label')), 'internalname' => 'allow_user_default_access', 'value' => ($vars['config']->allow_user_default_access ? elgg_echo('installation:allow_user_default_access:label') : "") )) . "
" . elgg_echo('installation:simplecache:description') . "
" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:simplecache:label')), 'internalname' => 'simplecache_enabled', 'value' => ($vars['config']->simplecache_enabled ? elgg_echo('installation:simplecache:label') : "") )) . "
" . elgg_echo('installation:viewpathcache:description') . "
" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:viewpathcache:label')), 'internalname' => 'viewpath_cache_enabled', 'value' => (($vars['config']->viewpath_cache_enabled) ? elgg_echo('installation:viewpathcache:label') : "") )) . "
" . elgg_echo('installation:debug'); +$form_body .= elgg_view('input/pulldown', array('options_values' => $debug_options, 'internalname' => 'debug', 'value' => $vars['config']->debug)); +$form_body .= '
'; + +// control new user registration +$options = array( + 'options' => array(elgg_echo('installation:registration:label')), + 'internalname' => 'allow_registration', + 'value' => $vars['config']->allow_registration ? elgg_echo('installation:registration:label') : '', +); +$form_body .= '' . elgg_echo('installation:registration:description');
+$form_body .= '
' .elgg_view('input/checkboxes', $options) . '
' . elgg_echo('installation:walled_garden:description');
+$form_body .= '
' . elgg_view('input/checkboxes', $options) . '
" . elgg_echo('installation:httpslogin') . "
" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:httpslogin:label')), 'internalname' => 'https_login', 'value' => ($vars['config']->https_login ? elgg_echo('installation:httpslogin:label') : "") )) . "
" . elgg_echo('installation:disableapi') . "
";
+$on = elgg_echo('installation:disableapi:label');
+if ((isset($CONFIG->disable_api)) && ($CONFIG->disable_api == true)) {
+ $on = ($vars['config']->disable_api ? "" : elgg_echo('installation:disableapi:label'));
+}
+$form_body .= elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:disableapi:label')), 'internalname' => 'api', 'value' => $on ));
+$form_body .= "
" . elgg_echo('installation:language') . elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $vars['config']->language, 'options_values' => $languages)) . "
"; + +$form_body .= "".elgg_view('input/submit', array('value' => elgg_echo("save"))); +$form_body = "" . elgg_echo('admin:site:access:warning') . "
";
-$form_body .= elgg_echo('installation:sitepermissions') . elgg_view('input/access', array('internalname' => 'default_access','value' => $vars['config']->default_access)) . "
" . elgg_echo('installation:allow_user_default_access:description') . "
" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:allow_user_default_access:label')), 'internalname' => 'allow_user_default_access', 'value' => ($vars['config']->allow_user_default_access ? elgg_echo('installation:allow_user_default_access:label') : "") )) . "
" . elgg_echo('installation:simplecache:description') . "
" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:simplecache:label')), 'internalname' => 'simplecache_enabled', 'value' => ($vars['config']->simplecache_enabled ? elgg_echo('installation:simplecache:label') : "") )) . "
" . elgg_echo('installation:viewpathcache:description') . "
" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:viewpathcache:label')), 'internalname' => 'viewpath_cache_enabled', 'value' => (($vars['config']->viewpath_cache_enabled) ? elgg_echo('installation:viewpathcache:label') : "") )) . "
" . elgg_echo('installation:debug'); -$form_body .= elgg_view('input/pulldown', array('options_values' => $debug_options, 'internalname' => 'debug', 'value' => $vars['config']->debug)); -$form_body .= '
'; - -// control new user registration -$options = array( - 'options' => array(elgg_echo('installation:registration:label')), - 'internalname' => 'allow_registration', - 'value' => $vars['config']->allow_registration ? elgg_echo('installation:registration:label') : '', -); -$form_body .= '' . elgg_echo('installation:registration:description');
-$form_body .= '
' .elgg_view('input/checkboxes', $options) . '
' . elgg_echo('installation:walled_garden:description');
-$form_body .= '
' . elgg_view('input/checkboxes', $options) . '
" . elgg_echo('installation:httpslogin') . "
" .elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:httpslogin:label')), 'internalname' => 'https_login', 'value' => ($vars['config']->https_login ? elgg_echo('installation:httpslogin:label') : "") )) . "
" . elgg_echo('installation:disableapi') . "
";
-$on = elgg_echo('installation:disableapi:label');
-if ((isset($CONFIG->disable_api)) && ($CONFIG->disable_api == true)) {
- $on = ($vars['config']->disable_api ? "" : elgg_echo('installation:disableapi:label'));
-}
-$form_body .= elgg_view("input/checkboxes", array('options' => array(elgg_echo('installation:disableapi:label')), 'internalname' => 'api', 'value' => $on ));
-$form_body .= "
" . elgg_echo('installation:language') . elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $vars['config']->language, 'options_values' => $languages)) . "
"; - -$form_body .= "".elgg_view('input/submit', array('value' => elgg_echo("save"))); -$form_body = "