From 65158f8d0796108ef5534a91b6ee34bf55d29223 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 17 Sep 2011 11:27:12 -0400 Subject: Fixes #2990 updated the bundled plugins to use the new plugin/user settings structure --- .../default/plugins/garbagecollector/settings.php | 28 ++++++++++++ .../default/settings/garbagecollector/edit.php | 28 ------------ .../views/default/plugins/groups/settings.php | 22 ++++++++++ mod/groups/views/default/settings/groups/edit.php | 22 ---------- .../views/default/plugins/logrotate/settings.php | 48 +++++++++++++++++++++ .../views/default/settings/logrotate/edit.php | 48 --------------------- .../views/default/plugins/twitter_api/settings.php | 50 ++++++++++++++++++++++ .../default/plugins/twitter_api/usersettings.php | 29 +++++++++++++ .../views/default/settings/twitter_api/edit.php | 50 ---------------------- .../default/usersettings/twitter_api/edit.php | 29 ------------- 10 files changed, 177 insertions(+), 177 deletions(-) create mode 100644 mod/garbagecollector/views/default/plugins/garbagecollector/settings.php delete mode 100644 mod/garbagecollector/views/default/settings/garbagecollector/edit.php create mode 100644 mod/groups/views/default/plugins/groups/settings.php delete mode 100644 mod/groups/views/default/settings/groups/edit.php create mode 100644 mod/logrotate/views/default/plugins/logrotate/settings.php delete mode 100644 mod/logrotate/views/default/settings/logrotate/edit.php create mode 100644 mod/twitter_api/views/default/plugins/twitter_api/settings.php create mode 100644 mod/twitter_api/views/default/plugins/twitter_api/usersettings.php delete mode 100644 mod/twitter_api/views/default/settings/twitter_api/edit.php delete mode 100644 mod/twitter_api/views/default/usersettings/twitter_api/edit.php diff --git a/mod/garbagecollector/views/default/plugins/garbagecollector/settings.php b/mod/garbagecollector/views/default/plugins/garbagecollector/settings.php new file mode 100644 index 000000000..3ade780f9 --- /dev/null +++ b/mod/garbagecollector/views/default/plugins/garbagecollector/settings.php @@ -0,0 +1,28 @@ +period; +if (!$period) { + $period = 'monthly'; +} + +?> +
+ + + 'params[period]', + 'options_values' => array( + 'weekly' => elgg_echo('garbagecollector:weekly'), + 'monthly' => elgg_echo('garbagecollector:monthly'), + 'yearly' => elgg_echo('garbagecollector:yearly'), + ), + 'value' => $period + )); + ?> +
diff --git a/mod/garbagecollector/views/default/settings/garbagecollector/edit.php b/mod/garbagecollector/views/default/settings/garbagecollector/edit.php deleted file mode 100644 index 3ade780f9..000000000 --- a/mod/garbagecollector/views/default/settings/garbagecollector/edit.php +++ /dev/null @@ -1,28 +0,0 @@ -period; -if (!$period) { - $period = 'monthly'; -} - -?> -
- - - 'params[period]', - 'options_values' => array( - 'weekly' => elgg_echo('garbagecollector:weekly'), - 'monthly' => elgg_echo('garbagecollector:monthly'), - 'yearly' => elgg_echo('garbagecollector:yearly'), - ), - 'value' => $period - )); - ?> -
diff --git a/mod/groups/views/default/plugins/groups/settings.php b/mod/groups/views/default/plugins/groups/settings.php new file mode 100644 index 000000000..7197dcb37 --- /dev/null +++ b/mod/groups/views/default/plugins/groups/settings.php @@ -0,0 +1,22 @@ +hidden_groups)) { + $vars['entity']->hidden_groups = 'no'; +} + +echo '
'; +echo elgg_echo('groups:allowhiddengroups'); +echo ' '; +echo elgg_view('input/dropdown', array( + 'name' => 'params[hidden_groups]', + 'options_values' => array( + 'no' => elgg_echo('option:no'), + 'yes' => elgg_echo('option:yes') + ), + 'value' => $vars['entity']->hidden_groups, +)); +echo '
'; diff --git a/mod/groups/views/default/settings/groups/edit.php b/mod/groups/views/default/settings/groups/edit.php deleted file mode 100644 index 7197dcb37..000000000 --- a/mod/groups/views/default/settings/groups/edit.php +++ /dev/null @@ -1,22 +0,0 @@ -hidden_groups)) { - $vars['entity']->hidden_groups = 'no'; -} - -echo '
'; -echo elgg_echo('groups:allowhiddengroups'); -echo ' '; -echo elgg_view('input/dropdown', array( - 'name' => 'params[hidden_groups]', - 'options_values' => array( - 'no' => elgg_echo('option:no'), - 'yes' => elgg_echo('option:yes') - ), - 'value' => $vars['entity']->hidden_groups, -)); -echo '
'; diff --git a/mod/logrotate/views/default/plugins/logrotate/settings.php b/mod/logrotate/views/default/plugins/logrotate/settings.php new file mode 100644 index 000000000..64c7bf743 --- /dev/null +++ b/mod/logrotate/views/default/plugins/logrotate/settings.php @@ -0,0 +1,48 @@ +period; +$time = $vars['entity']->time; +if (!$period) { + $period = 'monthly'; +} + +if (!$time) { + $time = 'monthly'; +} +?> +
+ + + 'params[period]', + 'options_values' => array( + 'weekly' => elgg_echo('logrotate:weekly'), + 'monthly' => elgg_echo('logrotate:monthly'), + 'yearly' => elgg_echo('logrotate:yearly'), + ), + 'value' => $period + )); + ?> + +
'); ?> + + + + 'params[time]', + 'options_values' => array( + 'weekly' => elgg_echo('logrotate:week'), + 'monthly' => elgg_echo('logrotate:month'), + 'yearly' => elgg_echo('logrotate:year'), + ), + 'value' => $time + )); + ?> +
diff --git a/mod/logrotate/views/default/settings/logrotate/edit.php b/mod/logrotate/views/default/settings/logrotate/edit.php deleted file mode 100644 index 64c7bf743..000000000 --- a/mod/logrotate/views/default/settings/logrotate/edit.php +++ /dev/null @@ -1,48 +0,0 @@ -period; -$time = $vars['entity']->time; -if (!$period) { - $period = 'monthly'; -} - -if (!$time) { - $time = 'monthly'; -} -?> -
- - - 'params[period]', - 'options_values' => array( - 'weekly' => elgg_echo('logrotate:weekly'), - 'monthly' => elgg_echo('logrotate:monthly'), - 'yearly' => elgg_echo('logrotate:yearly'), - ), - 'value' => $period - )); - ?> - -
'); ?> - - - - 'params[time]', - 'options_values' => array( - 'weekly' => elgg_echo('logrotate:week'), - 'monthly' => elgg_echo('logrotate:month'), - 'yearly' => elgg_echo('logrotate:year'), - ), - 'value' => $time - )); - ?> -
diff --git a/mod/twitter_api/views/default/plugins/twitter_api/settings.php b/mod/twitter_api/views/default/plugins/twitter_api/settings.php new file mode 100644 index 000000000..0b9afd4cf --- /dev/null +++ b/mod/twitter_api/views/default/plugins/twitter_api/settings.php @@ -0,0 +1,50 @@ + 'params[consumer_key]', + 'value' => $vars['entity']->consumer_key, + 'class' => 'elgg-input-thin', +)); + +$consumer_secret_string = elgg_echo('twitter_api:consumer_secret'); +$consumer_secret_view = elgg_view('input/text', array( + 'name' => 'params[consumer_secret]', + 'value' => $vars['entity']->consumer_secret, + 'class' => 'elgg-input-thin', +)); + +$sign_on_with_twitter_string = elgg_echo('twitter_api:login'); +$sign_on_with_twitter_view = elgg_view('input/dropdown', array( + 'name' => 'params[sign_on]', + 'options_values' => array( + 'yes' => elgg_echo('option:yes'), + 'no' => elgg_echo('option:no'), + ), + 'value' => $vars['entity']->sign_on ? $vars['entity']->sign_on : 'no', +)); + +$new_users_with_twitter = elgg_echo('twitter_api:new_users'); +$new_users_with_twitter_view = elgg_view('input/dropdown', array( + 'name' => 'params[new_users]', + 'options_values' => array( + 'yes' => elgg_echo('option:yes'), + 'no' => elgg_echo('option:no'), + ), + 'value' => $vars['entity']->new_users ? $vars['entity']->new_users : 'no', +)); + +$settings = <<<__HTML +

$instructions

+

$consumer_key_view
+

$consumer_secret_view
+
$sign_on_with_twitter_string $sign_on_with_twitter_view
+
$new_users_with_twitter $new_users_with_twitter_view
+__HTML; + +echo $settings; diff --git a/mod/twitter_api/views/default/plugins/twitter_api/usersettings.php b/mod/twitter_api/views/default/plugins/twitter_api/usersettings.php new file mode 100644 index 000000000..acb8d9af5 --- /dev/null +++ b/mod/twitter_api/views/default/plugins/twitter_api/usersettings.php @@ -0,0 +1,29 @@ +getGUID(); +$twitter_name = get_plugin_usersetting('twitter_name', $user_guid, 'twitter_api'); +$access_key = get_plugin_usersetting('access_key', $user_guid, 'twitter_api'); +$access_secret = get_plugin_usersetting('access_secret', $user_guid, 'twitter_api'); + +$site_name = elgg_get_site_entity()->name; +echo '
' . elgg_echo('twitter_api:usersettings:description', array($site_name)) . '
'; + +if (!$access_key || !$access_secret) { + // send user off to validate account + $request_link = twitter_api_get_authorize_url(null, false); + echo '
' . elgg_echo('twitter_api:usersettings:request', array($request_link, $site_name)) . '
'; +} else { + // if this user logged in through twitter and never set up an email address, don't + // let them disassociate their account. + if ($user->email) { + $url = elgg_get_site_url() . "twitter_api/revoke"; + echo ''; + echo '
' . sprintf(elgg_echo('twitter_api:usersettings:revoke'), $url) . '
'; + } else { + echo elgg_echo('twitter_api:usersettings:cannot_revoke', array(elgg_normalize_url('twitter_api/interstitial'))); + } +} diff --git a/mod/twitter_api/views/default/settings/twitter_api/edit.php b/mod/twitter_api/views/default/settings/twitter_api/edit.php deleted file mode 100644 index 0b9afd4cf..000000000 --- a/mod/twitter_api/views/default/settings/twitter_api/edit.php +++ /dev/null @@ -1,50 +0,0 @@ - 'params[consumer_key]', - 'value' => $vars['entity']->consumer_key, - 'class' => 'elgg-input-thin', -)); - -$consumer_secret_string = elgg_echo('twitter_api:consumer_secret'); -$consumer_secret_view = elgg_view('input/text', array( - 'name' => 'params[consumer_secret]', - 'value' => $vars['entity']->consumer_secret, - 'class' => 'elgg-input-thin', -)); - -$sign_on_with_twitter_string = elgg_echo('twitter_api:login'); -$sign_on_with_twitter_view = elgg_view('input/dropdown', array( - 'name' => 'params[sign_on]', - 'options_values' => array( - 'yes' => elgg_echo('option:yes'), - 'no' => elgg_echo('option:no'), - ), - 'value' => $vars['entity']->sign_on ? $vars['entity']->sign_on : 'no', -)); - -$new_users_with_twitter = elgg_echo('twitter_api:new_users'); -$new_users_with_twitter_view = elgg_view('input/dropdown', array( - 'name' => 'params[new_users]', - 'options_values' => array( - 'yes' => elgg_echo('option:yes'), - 'no' => elgg_echo('option:no'), - ), - 'value' => $vars['entity']->new_users ? $vars['entity']->new_users : 'no', -)); - -$settings = <<<__HTML -

$instructions

-

$consumer_key_view
-

$consumer_secret_view
-
$sign_on_with_twitter_string $sign_on_with_twitter_view
-
$new_users_with_twitter $new_users_with_twitter_view
-__HTML; - -echo $settings; diff --git a/mod/twitter_api/views/default/usersettings/twitter_api/edit.php b/mod/twitter_api/views/default/usersettings/twitter_api/edit.php deleted file mode 100644 index acb8d9af5..000000000 --- a/mod/twitter_api/views/default/usersettings/twitter_api/edit.php +++ /dev/null @@ -1,29 +0,0 @@ -getGUID(); -$twitter_name = get_plugin_usersetting('twitter_name', $user_guid, 'twitter_api'); -$access_key = get_plugin_usersetting('access_key', $user_guid, 'twitter_api'); -$access_secret = get_plugin_usersetting('access_secret', $user_guid, 'twitter_api'); - -$site_name = elgg_get_site_entity()->name; -echo '
' . elgg_echo('twitter_api:usersettings:description', array($site_name)) . '
'; - -if (!$access_key || !$access_secret) { - // send user off to validate account - $request_link = twitter_api_get_authorize_url(null, false); - echo '
' . elgg_echo('twitter_api:usersettings:request', array($request_link, $site_name)) . '
'; -} else { - // if this user logged in through twitter and never set up an email address, don't - // let them disassociate their account. - if ($user->email) { - $url = elgg_get_site_url() . "twitter_api/revoke"; - echo ''; - echo '
' . sprintf(elgg_echo('twitter_api:usersettings:revoke'), $url) . '
'; - } else { - echo elgg_echo('twitter_api:usersettings:cannot_revoke', array(elgg_normalize_url('twitter_api/interstitial'))); - } -} -- cgit v1.2.3