mirror of
https://git.friendi.ca/friendica/friendica-addons.git
synced 2025-06-16 20:35:15 +02:00
Fix widgets crosssite ajax, make like widget works
This commit is contained in:
parent
056921b1e8
commit
255685c176
5 changed files with 68 additions and 20 deletions
|
@ -40,8 +40,10 @@ 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"));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -104,13 +106,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 {
|
||||
|
@ -136,14 +132,15 @@ function widgets_content(&$a) {
|
|||
$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]."_". ceil(microtime(true)*100),
|
||||
'$loader' => $a->get_baseurl()."/images/rotator.gif",
|
||||
'$args' => (isset($_GET['a'])?$_GET['a']:''),
|
||||
));
|
||||
|
||||
|
||||
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 +152,8 @@ function widgets_content(&$a) {
|
|||
.$jsargs
|
||||
.htmlspecialchars('"></script>')
|
||||
."</code>";
|
||||
|
||||
|
||||
return $o;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue