Merge branch '3.6-rc'

[friendica-addons.git] / widgets / widgets.php

diff --git a/widgets/widgets.php b/widgets/widgets.php
old mode 100755 (executable)
new mode 100644 (file)
index e629324..76fc14b
--- a/widgets/widgets.php
+++ b/widgets/widgets.php
@@ -5,17 +5,18 @@
  * Version: 1.0
  * Author: Fabio Comuni <http://kirgroup.com/profile/fabrix/>
  */
-
+use Friendica\Core\Addon;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 
 function widgets_install() {
-       register_hook('plugin_settings', 'addon/widgets/widgets.php', 'widgets_settings'); 
-       register_hook('plugin_settings_post', 'addon/widgets/widgets.php', 'widgets_settings_post');
+       Addon::registerHook('addon_settings', 'addon/widgets/widgets.php', 'widgets_settings');
+       Addon::registerHook('addon_settings_post', 'addon/widgets/widgets.php', 'widgets_settings_post');
        logger("installed widgets");
 }
 function widgets_uninstall() {
-       unregister_hook('plugin_settings', 'addon/widgets/widgets.php', 'widgets_settings'); 
-       unregister_hook('plugin_settings_post', 'addon/widgets/widgets.php', 'widgets_settings_post');
+       Addon::unregisterHook('addon_settings', 'addon/widgets/widgets.php', 'widgets_settings');
+       Addon::unregisterHook('addon_settings_post', 'addon/widgets/widgets.php', 'widgets_settings_post');
 }
 
 
@@ -33,8 +34,8 @@ function widgets_settings(&$a,&$o) {
                return;         
        
        
-       $key = PConfig::get(local_user(), 'widgets', 'key' );
-       if ($key=='') { $key = mt_rand(); PConfig::set(local_user(), 'widgets', 'key', $key); }
+       $key = get_pconfig(local_user(), 'widgets', 'key' );
+       if ($key=='') { $key = mt_rand(); set_pconfig(local_user(), 'widgets', 'key', $key); }
 
        $widgets = array();
        $d = dir(dirname(__file__));
@@ -54,13 +55,13 @@ function widgets_settings(&$a,&$o) {
        
 #      $t = file_get_contents( dirname(__file__). "/settings.tpl" );
        $t = get_markup_template("settings.tpl", "addon/widgets/");
-       $o .= replace_macros($t, array(
-               '$submit' => t('Generate new key'),
+       $o .= replace_macros($t, [
+               '$submit' => L10n::t('Generate new key'),
                '$baseurl' => $a->get_baseurl(),
                '$title' => "Widgets",
-               '$label' => t('Widgets key'),
+               '$label' => L10n::t('Widgets key'),
                '$key' => $key,
-               '$widgets_h' => t('Widgets available'),
+               '$widgets_h' => L10n::t('Widgets available'),
                '$widgets' => $widgets,
        ));
        
@@ -122,7 +123,7 @@ function widgets_content(&$a) {
                if (isset($_GET['p']) && local_user()==$conf['uid'] ) {
                        $o .= "<style>.f9k_widget { float: left;border:1px solid black; }</style>";
                        $o .= "<h1>Preview Widget</h1>";
-                       $o .= '<a href="'.$a->get_baseurl().'/settings/addon">'. t("Plugin Settings") .'</a>';
+                       $o .= '<a href="'.$a->get_baseurl().'/settings/addon">'. L10n::t("Addon Settings") .'</a>';
 
                        $o .=  "<h4>".call_user_func($a->argv[1].'_widget_name')."</h4>";
                        $o .=  call_user_func($a->argv[1].'_widget_help');
@@ -166,15 +167,9 @@ function widgets_content(&$a) {
 
                        
                        return $o;
-               }       
-               
-       }       
-       
+               }
+       }
+
        echo $o;
        killme();
 }
-
-
-
- 
-?>