Issue 3873

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

diff --git a/widgets/widgets.php b/widgets/widgets.php
old mode 100644 (file)
new mode 100755 (executable)
index 13c4f93..e629324
--- a/widgets/widgets.php
+++ b/widgets/widgets.php
@@ -1,12 +1,13 @@
 <?php
 /**
  * Name: Widgets
- * Description: Allow to embed info from friendika into another site
+ * Description: Allow to embed info from friendica into another site
  * Version: 1.0
  * Author: Fabio Comuni <http://kirgroup.com/profile/fabrix/>
  */
- 
-        
+
+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');
@@ -19,7 +20,8 @@ function widgets_uninstall() {
 
 
 function widgets_settings_post(){
-       
+       if(! local_user())
+               return;
        if (isset($_POST['widgets-submit'])){
                del_pconfig(local_user(), 'widgets', 'key');
                
@@ -31,8 +33,8 @@ function widgets_settings(&$a,&$o) {
                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 = array();
        $d = dir(dirname(__file__));
@@ -40,15 +42,18 @@ function widgets_settings(&$a,&$o) {
                 if(substr($f,0,7)=="widget_") {
                         preg_match("|widget_([^.]+).php|", $f, $m);
                         $w=$m[1];
-                        require_once($f);
-                        $widgets[] = array($w, call_user_func($w."_widget_name"));
+                        if ($w!=""){
+                               require_once($f);
+                               $widgets[] = array($w, call_user_func($w."_widget_name"));
+                       }
 
                 }
        }
 
        
        
-       $t = file_get_contents( dirname(__file__). "/settings.tpl" );
+#      $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'),
                '$baseurl' => $a->get_baseurl(),
@@ -70,6 +75,10 @@ function _abs_url($s){
        return preg_replace("|href=(['\"])([^h][^t][^t][^p])|", "href=\$1".$a->get_baseurl()."/\$2", $s);
 }
 
+function _randomAlphaNum($length){
+       return substr(str_shuffle(str_repeat('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789',$length)),0,$length);
+} 
+
 
 function widgets_content(&$a) {
 
@@ -104,13 +113,7 @@ function widgets_content(&$a) {
 
        //echo "<pre>"; var_dump($a->argv); die();
        if ($a->argv[2]=="cb"){
-               /*if (!local_user()){
-                       if (!isset($_GET['s']))
-                               {header('HTTP/1.0 400 Bad Request'); killme();}
-                       
-                       if (substr($_GET['s'],0,strlen($conf['site'])) !== $conf['site'])
-                               {header('HTTP/1.0 400 Bad Request'); killme();}
-               } */
+               /*header('Access-Control-Allow-Origin: *');*/
                $o .= call_user_func($a->argv[1].'_widget_content',$a, $conf);
                
        } else {
@@ -130,20 +133,25 @@ function widgets_content(&$a) {
                }
        
        
-
+               
+               $widget_size = call_user_func($a->argv[1].'_widget_size');
        
                $script = file_get_contents(dirname(__file__)."/widgets.js");
                $o .= replace_macros($script, array(
                        '$entrypoint' => $a->get_baseurl()."/widgets/".$a->argv[1]."/cb/",
                        '$key' => $conf['key'],
-                       '$widget_id' => 'f9k_'.$a->argv[1]."_".time(),
+                       '$widget_id' => 'f9a_'.$a->argv[1]."_"._randomAlphaNum(6),
                        '$loader' => $a->get_baseurl()."/images/rotator.gif",
                        '$args' => (isset($_GET['a'])?$_GET['a']:''),
+                       '$width' => $widget_size[0],
+                       '$height' => $widget_size[1],
+                       '$type' => $a->argv[1],
                ));
 
        
                if (isset($_GET['p'])) {
-                       $jsargs = implode("</em>,<em>", call_user_func($a->argv[1].'_widget_args'));
+                       $wargs = call_user_func($a->argv[1].'_widget_args');
+                       $jsargs = implode("</em>,<em>", $wargs);
                        if ($jsargs!='') $jsargs = "&a=<em>".$jsargs."</em>";
                                
                        $o .= "</script>
@@ -155,6 +163,8 @@ function widgets_content(&$a) {
                        .$jsargs
                        .htmlspecialchars('"></script>')
                        ."</code>";
+
+                       
                        return $o;
                }