Merge branch '3.6-rc'

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

diff --git a/widgets/widgets.php b/widgets/widgets.php
index 72534ce3bb75863556051ffbbbe91c13738eacc0..76fc14b48b4270a49d4623c1b95c04d62509ffed 100644 (file)
--- a/widgets/widgets.php
+++ b/widgets/widgets.php
@@ -5,16 +5,18 @@
  * Version: 1.0
  * Author: Fabio Comuni <http://kirgroup.com/profile/fabrix/>
  */
  * 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() {
 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() {
        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');

 }
 
 
 }
 
 


@@ -53,13 +55,13 @@ function widgets_settings(&$a,&$o) {
        
 #      $t = file_get_contents( dirname(__file__). "/settings.tpl" );
        $t = get_markup_template("settings.tpl", "addon/widgets/");
        
 #      $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",
                '$baseurl' => $a->get_baseurl(),
                '$title' => "Widgets",

-               '$label' => t('Widgets key'),
+               '$label' => L10n::t('Widgets key'),

                '$key' => $key,
                '$key' => $key,

-               '$widgets_h' => t('Widgets available'),
+               '$widgets_h' => L10n::t('Widgets available'),

                '$widgets' => $widgets,
        ));
        
                '$widgets' => $widgets,
        ));
        


@@ -121,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>";
                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');
 
                        $o .=  "<h4>".call_user_func($a->argv[1].'_widget_name')."</h4>";
                        $o .=  call_user_func($a->argv[1].'_widget_help');


@@ -165,15 +167,9 @@ function widgets_content(&$a) {
 
                        
                        return $o;
 
                        
                        return $o;

-               }       
-               
-       }       
-       
+               }
+       }
+

        echo $o;
        killme();
 }
        echo $o;
        killme();
 }

-
-
-
- 
-?>