X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=widgets%2Fwidgets.php;h=72534ce3bb75863556051ffbbbe91c13738eacc0;hb=1b861c6660d5aaf91ea9b93efee67daa9019d3fb;hp=cedaea34b1ca7167d9a99ca00bfcb22e6cce3be2;hpb=255685c17698530da9e252e013c4ef1f1b048b7d;p=friendica-addons.git diff --git a/widgets/widgets.php b/widgets/widgets.php old mode 100644 new mode 100755 index cedaea34..72534ce3 --- a/widgets/widgets.php +++ b/widgets/widgets.php @@ -1,7 +1,7 @@ */ @@ -19,7 +19,8 @@ function widgets_uninstall() { function widgets_settings_post(){ - + if(! local_user()) + return; if (isset($_POST['widgets-submit'])){ del_pconfig(local_user(), 'widgets', 'key'); @@ -50,7 +51,8 @@ function widgets_settings(&$a,&$o) { - $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(), @@ -72,6 +74,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) { @@ -106,7 +112,7 @@ function widgets_content(&$a) { //echo "
"; var_dump($a->argv); die();
 	if ($a->argv[2]=="cb"){
-		header('Access-Control-Allow-Origin: *');
+		/*header('Access-Control-Allow-Origin: *');*/
 		$o .= call_user_func($a->argv[1].'_widget_content',$a, $conf);
 		
 	} else {
@@ -126,15 +132,19 @@ 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' => 'f9a_'.$a->argv[1]."_". ceil(microtime(true)*100),
+			'$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],
 		));