Fixes #3824 fixed deprecation warnings for plugin settings and usersettings

diff --git a/mod/logrotate/languages/en.php b/mod/logrotate/languages/en.php
index c3cf2d8ad8fc24badd752e51f0bd8d779546178d..27731d732a5ed810fd3c17e2163af3186cd1949d 100644 (file)
--- a/mod/logrotate/languages/en.php
+++ b/mod/logrotate/languages/en.php
@@ -15,7 +15,7 @@ $english = array(
        'logrotate:logrotated' => "Log rotated\n",
        'logrotate:lognotrotated' => "Error rotating log\n",
        
-       'logrotate:date' => 'Delete archived logs older than a',
+       'logrotate:delete' => 'Delete archived logs older than a',
 
        'logrotate:week' => 'week',
        'logrotate:month' => 'month',

diff --git a/mod/logrotate/start.php b/mod/logrotate/start.php
index c05506d834890dd9adcac7ea33127bdac17f2771..28f14ad14179e991a5a270c304cc078bc1e955f0 100644 (file)
--- a/mod/logrotate/start.php
+++ b/mod/logrotate/start.php
@@ -9,7 +9,7 @@ elgg_register_event_handler('init', 'system', 'logrotate_init');
 
 function logrotate_init() {
        $period = elgg_get_plugin_setting('period', 'logrotate');
-       $time = elgg_get_plugin_setting('time', 'logrotate');
+       $delete = elgg_get_plugin_setting('delete', 'logrotate');
        switch ($period) {
                case 'weekly':
                case 'monthly' :
@@ -22,7 +22,7 @@ function logrotate_init() {
        // Register cron hook for archival of logs
        elgg_register_plugin_hook_handler('cron', $period, 'logrotate_archive_cron');
        // Register cron hook for deletion of selected archived logs
-       elgg_register_plugin_hook_handler('cron', $time, 'logrotate_delete_cron');
+       elgg_register_plugin_hook_handler('cron', $delete, 'logrotate_delete_cron');
 }
 
 /**
@@ -64,7 +64,7 @@ function logrotate_delete_cron($hook, $entity_type, $returnvalue, $params) {
        $day = 86400;
 
        $offset = 0;
-       $period = elgg_get_plugin_setting('time', 'logrotate');
+       $period = elgg_get_plugin_setting('delete', 'logrotate');
        switch ($period) {
                case 'weekly':
                        $offset = $day * 7;
@@ -90,7 +90,6 @@ function logrotate_delete_cron($hook, $entity_type, $returnvalue, $params) {
  *
  * @param int $time_of_delete An offset in seconds from now to delete (useful for log deletion)
  */
-
 function log_browser_delete_log($time_of_delete) {
        global $CONFIG;
 

diff --git a/mod/logrotate/views/default/plugins/logrotate/settings.php b/mod/logrotate/views/default/plugins/logrotate/settings.php
index 64c7bf743901bf57a7b35108c1f3b2d72d6dbcf0..d9c4032feb097f5e0fef4ed62f86e1e4a6d0da2f 100644 (file)
--- a/mod/logrotate/views/default/plugins/logrotate/settings.php
+++ b/mod/logrotate/views/default/plugins/logrotate/settings.php
@@ -16,9 +16,9 @@ if (!$time) {
 }              
 ?>
 <div>
-       <?php echo elgg_echo('logrotate:period'); ?>
-       
        <?php
+
+               echo elgg_echo('logrotate:period') . ' ';
                echo elgg_view('input/dropdown', array(
                        'name' => 'params[period]',
                        'options_values' => array(
@@ -29,14 +29,13 @@ if (!$time) {
                        'value' => $period
                ));
        ?>
-
-       <?php echo elgg_echo('</div><div>'); ?>
-
-       <?php echo elgg_echo('logrotate:date'); ?>
-       
+</div>
+<div>
        <?php
-               echo elgg_view('input/pulldown', array(
-                       'name' => 'params[time]',
+
+               echo elgg_echo('logrotate:delete') . ' ';
+               echo elgg_view('input/dropdown', array(
+                       'name' => 'params[delete]',
                        'options_values' => array(
                                'weekly' => elgg_echo('logrotate:week'),
                                'monthly' => elgg_echo('logrotate:month'),

diff --git a/mod/twitter_api/views/default/plugins/twitter_api/usersettings.php b/mod/twitter_api/views/default/plugins/twitter_api/usersettings.php
index acb8d9af57df4716608de9b9f46d8e87dc0c01f3..65d04b8837b1e17151896ac85d430fad7714e40e 100644 (file)
--- a/mod/twitter_api/views/default/plugins/twitter_api/usersettings.php
+++ b/mod/twitter_api/views/default/plugins/twitter_api/usersettings.php
@@ -5,9 +5,9 @@
 
 $user = elgg_get_logged_in_user_entity();
 $user_guid = $user->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');
+$twitter_name = elgg_get_plugin_user_setting('twitter_name', $user_guid, 'twitter_api');
+$access_key = elgg_get_plugin_user_setting('access_key', $user_guid, 'twitter_api');
+$access_secret = elgg_get_plugin_user_setting('access_secret', $user_guid, 'twitter_api');
 
 $site_name = elgg_get_site_entity()->name;
 echo '<div>' . elgg_echo('twitter_api:usersettings:description', array($site_name)) . '</div>';
@@ -21,7 +21,7 @@ if (!$access_key || !$access_secret) {
        // let them disassociate their account.
        if ($user->email) {
                $url = elgg_get_site_url() . "twitter_api/revoke";
-               echo '<div class="twitter_anywhere">' . elgg_echo('twitter_api:usersettings:authorized', array($site_name, $twitter_name)) . '</div>';
+               echo '<div>' . elgg_echo('twitter_api:usersettings:authorized', array($site_name, $twitter_name)) . '</div>';
                echo '<div>' . sprintf(elgg_echo('twitter_api:usersettings:revoke'), $url) . '</div>';
        } else {
                echo elgg_echo('twitter_api:usersettings:cannot_revoke', array(elgg_normalize_url('twitter_api/interstitial')));