Changeset 8481

Timestamp:

01/06/11 00:30:58 (2 years ago)

Author:

rub

Message:

Upload button: check extension and reduce window size

Location:

extensions/FacebookPlug/Plugin

Files:

• include/conf.inc.php (modified) (2 diffs)
• tpl/buttons.tpl (modified) (2 diffs)

extensions/FacebookPlug/Plugin/include/conf.inc.php

@@ -24 +24 @@
 }
 
-global $conf;
+global $conf, $page;
 
 $conf['fbp'] = array_merge(
@@ -121 +121 @@
   $conf['fbp']['social_plugin_like_box']);
 
-//~ print_r($conf['fbp']);
+//From http://developers.facebook.com/docs/reference/rest/photos.upload/
+// *GIF *JPG *PNG *PSD *TIFF *JP2 *IFF *WBMP *XBM
+$page['fbp']['available_upload_ext'] = array('GIF', 'JPG', 'PNG', 'PSD', 'TIFF', 'JP2', 'IFF', 'WBMP', 'XBM');
 
 ?>

extensions/FacebookPlug/Plugin/tpl/buttons.tpl

@@ -11 +11 @@
 {* method 2 *}
 {*
-<a href="http://www.facebook.com/sharer.php?u={$fbp_page.url|@urlencode}" title="{'Share on Facebook'|@translate}" rel="nofollow" onclick="window.open(this.href, 'Facebook','width=550,height=350,location=no,status=no,toolbar=no,scrollbars=no,menubar=no'); return false;"><img src="{$FBP_PATH|@cat:'/icon/share.png'}" class="button" alt="{'Share on Facebook'|@translate}"></a>
+<a href="http://www.facebook.com/sharer.php?u={$fbp_page.url|@urlencode}" title="{'Share on Facebook'|@translate}" rel="nofollow" onclick="window.open(this.href, 'Facebook_Share','width=550,height=350,location=no,status=no,toolbar=no,scrollbars=no,menubar=no'); return false;"><img src="{$FBP_PATH|@cat:'/icon/share.png'}" class="button" alt="{'Share on Facebook'|@translate}"></a>
 *}
 {* method 3 *}
@@ -27 +27 @@
 {/if} {* $fbp.share_picture or $fbp.share_album *}
 {* --------------------------------------------------------------------------- *}
-{if $fbp.upload_picture and $FBP_SCRIPT_BASENAME == 'picture'}
-<a href="{$PIWIGO_FACEBOOK_UPLOAD_URL}?u={$fbp_page.url_image|@urlencode}&amp;pu={$fbp_page.url|@urlencode}&amp;pt={$PAGE_TITLE|@replace:'"':' '}&amp;gt={$GALLERY_TITLE|@replace:'"':' '}" title="{'Upload photo on Facebook'|@translate}" rel="nofollow" onclick="window.open(this.href, 'Facebook','width=550,height=350,location=no,status=no,toolbar=no,scrollbars=no,menubar=no'); return false;"><img src="{$FBP_PATH|@cat:'/icon/upload.png'}" class="button" alt="{'Share on Facebook'|@translate}"></a>
+{if $fbp.upload_picture and $FBP_SCRIPT_BASENAME == 'picture' and in_array($fbp_page.url_image|get_extension|strtoupper, $fbp_page.available_upload_ext)}
+<a href="{$PIWIGO_FACEBOOK_UPLOAD_URL}?u={$fbp_page.url_image|@urlencode}&amp;pu={$fbp_page.url|@urlencode}&amp;pt={$PAGE_TITLE|@replace:'"':' '}&amp;gt={$GALLERY_TITLE|@replace:'"':' '}" title="{'Upload photo on Facebook'|@translate}" rel="nofollow" onclick="window.open(this.href, 'Facebook_Upload','width=250,height=50,location=no,status=no,toolbar=no,scrollbars=no,menubar=no'); return false;"><img src="{$FBP_PATH|@cat:'/icon/upload.png'}" class="button" alt="{'Share on Facebook'|@translate}"></a>
 {/if} {* $fbp.upload_picture  and $FBP_SCRIPT_BASENAME == 'picture' *}
 {* --------------------------------------------------------------------------- *}