Merge branch '3.6-rc'

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

diff --git a/widgets/widgets.php b/widgets/widgets.php
index 1c7489f1ca6503f05c142721048db92e277cd900..76fc14b48b4270a49d4623c1b95c04d62509ffed 100644 (file)
--- a/widgets/widgets.php
+++ b/widgets/widgets.php
@@ -24,20 +24,20 @@ function widgets_settings_post(){
        if(! local_user())
                return;
        if (isset($_POST['widgets-submit'])){
-               PConfig::delete(local_user(), 'widgets', 'key');
-
+               del_pconfig(local_user(), 'widgets', 'key');
+               
        }
 }
 
 function widgets_settings(&$a,&$o) {
     if(! local_user())
-               return;
-
+               return;         
+       
+       
+       $key = get_pconfig(local_user(), 'widgets', 'key' );
+       if ($key=='') { $key = mt_rand(); set_pconfig(local_user(), 'widgets', 'key', $key); }
 
-       $key = PConfig::get(local_user(), 'widgets', 'key' );
-       if ($key=='') { $key = mt_rand(); PConfig::set(local_user(), 'widgets', 'key', $key); }
-
-       $widgets = [];
+       $widgets = array();
        $d = dir(dirname(__file__));
        while(false !== ($f = $d->read())) {
                 if(substr($f,0,7)=="widget_") {
@@ -45,14 +45,14 @@ function widgets_settings(&$a,&$o) {
                         $w=$m[1];
                         if ($w!=""){
                                require_once($f);
-                               $widgets[] = [$w, call_user_func($w."_widget_name")];
+                               $widgets[] = array($w, call_user_func($w."_widget_name"));
                        }
 
                 }
        }
 
-
-
+       
+       
 #      $t = file_get_contents( dirname(__file__). "/settings.tpl" );
        $t = get_markup_template("settings.tpl", "addon/widgets/");
        $o .= replace_macros($t, [
@@ -63,8 +63,8 @@ function widgets_settings(&$a,&$o) {
                '$key' => $key,
                '$widgets_h' => L10n::t('Widgets available'),
                '$widgets' => $widgets,
-       ]);
-
+       ));
+       
 }
 
 function widgets_module() {
@@ -78,7 +78,7 @@ function _abs_url($s){
 
 function _randomAlphaNum($length){
        return substr(str_shuffle(str_repeat('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789',$length)),0,$length);
-}
+} 
 
 
 function widgets_content(&$a) {
@@ -94,12 +94,12 @@ function widgets_content(&$a) {
        if (!count($r)){
                if($a->argv[2]=="cb"){header('HTTP/1.0 400 Bad Request'); killme();}
                return;
-       }
-       $conf = [];
+       }    
+       $conf = array();
        $conf['uid'] = $r[0]['uid'];
        foreach($r as $e) { $conf[$e['k']]=$e['v']; }
-
-       $o = "";
+       
+       $o = "";        
 
        $widgetfile =dirname(__file__)."/widget_".$a->argv[1].".php";
        if (file_exists($widgetfile)){
@@ -107,8 +107,8 @@ function widgets_content(&$a) {
        } else {
                if($a->argv[2]=="cb"){header('HTTP/1.0 400 Bad Request'); killme();}
                return;
-       }
-
+       }               
+       
 
 
 
@@ -116,10 +116,10 @@ function widgets_content(&$a) {
        if ($a->argv[2]=="cb"){
                /*header('Access-Control-Allow-Origin: *');*/
                $o .= call_user_func($a->argv[1].'_widget_content',$a, $conf);
-
+               
        } else {
 
-
+               
                if (isset($_GET['p']) && local_user()==$conf['uid'] ) {
                        $o .= "<style>.f9k_widget { float: left;border:1px solid black; }</style>";
                        $o .= "<h1>Preview Widget</h1>";
@@ -132,13 +132,13 @@ function widgets_content(&$a) {
                } else {
                        header("content-type: application/x-javascript");
                }
-
-
-
+       
+       
+               
                $widget_size = call_user_func($a->argv[1].'_widget_size');
-
+       
                $script = file_get_contents(dirname(__file__)."/widgets.js");
-               $o .= replace_macros($script, [
+               $o .= replace_macros($script, array(
                        '$entrypoint' => $a->get_baseurl()."/widgets/".$a->argv[1]."/cb/",
                        '$key' => $conf['key'],
                        '$widget_id' => 'f9a_'.$a->argv[1]."_"._randomAlphaNum(6),
@@ -147,25 +147,25 @@ function widgets_content(&$a) {
                        '$width' => $widget_size[0],
                        '$height' => $widget_size[1],
                        '$type' => $a->argv[1],
-               ]);
-
+               ));
 
+       
                if (isset($_GET['p'])) {
                        $wargs = call_user_func($a->argv[1].'_widget_args');
                        $jsargs = implode("</em>,<em>", $wargs);
                        if ($jsargs!='') $jsargs = "&a=<em>".$jsargs."</em>";
-
+                               
                        $o .= "</script>
                        <br style='clear:left'/><br/>
                        <h4>Copy and paste this code</h4>
                        <code>"
-
+                       
                        .htmlspecialchars('<script src="'.$a->get_baseurl().'/widgets/'.$a->argv[1].'?k='.$conf['key'])
                        .$jsargs
                        .htmlspecialchars('"></script>')
                        ."</code>";
 
-
+                       
                        return $o;
                }
        }