Index: /extensions/FacebookPlug/Plugin/admin.config.php =================================================================== --- /extensions/FacebookPlug/Plugin/admin.config.php (revision 8274) +++ /extensions/FacebookPlug/Plugin/admin.config.php (revision 8275) @@ -74,5 +74,5 @@ // Like box $conf['fbp']['social_plugin_like_box']['enabled'] = empty($_POST['FBP_SOCIAL_PLUGIN_LIKE_BOX_ENABLED']) ? false : true; - $conf['fbp']['social_plugin_like_box']['url_type'] = $url_type[$_POST['FBP_SOCIAL_PLUGIN_LIKE_BOX_URL_TYPE']]; + $conf['fbp']['social_plugin_like_box']['url'] = $_POST['FBP_SOCIAL_PLUGIN_LIKE_BOX_URL']; $conf['fbp']['social_plugin_like_box']['colorscheme'] = $colorscheme[$_POST['FBP_SOCIAL_PLUGIN_LIKE_BOX_COLORSCHEME']]; $conf['fbp']['social_plugin_like_box']['show_faces'] = empty($_POST['FBP_SOCIAL_PLUGIN_LIKE_BOX_SHOW_FACES']) ? false : true; @@ -101,5 +101,12 @@ param = \'fbp\' ;'; - pwg_query($query); + if (pwg_query($query)) + { + array_push($page['infos'], l10n('Data updated with success')); + } + else + { + array_push($page['errors'], l10n('Data updated with error')); + } } @@ -130,6 +137,5 @@ 'FB_PAGE' => 'http://developers.facebook.com/docs/reference/plugins/like-box', 'ENABLED' => ($conf['fbp']['social_plugin_like_box']['enabled'] ? 'checked="checked"' : ''), - 'URL_TYPE_OPTIONS' => $url_type_l10n, - 'URL_TYPE_OPTIONS_SELECTED' => array_search($conf['fbp']['social_plugin_like_box']['url_type'], $url_type), + 'URL' => $conf['fbp']['social_plugin_like_box']['url'], 'COLORSCHEME_OPTIONS' => $colorscheme_l10n, 'COLORSCHEME_OPTIONS_SELECTED' => array_search($conf['fbp']['social_plugin_like_box']['colorscheme'], $colorscheme), Index: /extensions/FacebookPlug/Plugin/css/fbp.css =================================================================== --- /extensions/FacebookPlug/Plugin/css/fbp.css (revision 8275) +++ /extensions/FacebookPlug/Plugin/css/fbp.css (revision 8275) @@ -0,0 +1,6 @@ +#fb-xfbml-like-box { + margin-bottom: 0px; + margin-left: 10px; + margin-right: 0px; + margin-top: 10px; +} Index: /extensions/FacebookPlug/Plugin/css/index.php =================================================================== --- /extensions/FacebookPlug/Plugin/css/index.php (revision 8275) +++ /extensions/FacebookPlug/Plugin/css/index.php (revision 8275) @@ -0,0 +1,27 @@ + Index: /extensions/FacebookPlug/Plugin/include/admin.inc.php =================================================================== --- /extensions/FacebookPlug/Plugin/include/admin.inc.php (revision 8274) +++ /extensions/FacebookPlug/Plugin/include/admin.inc.php (revision 8275) @@ -24,5 +24,4 @@ } - function fbp_get_admin_plugin_menu_links($menu) { Index: /extensions/FacebookPlug/Plugin/include/conf.inc.php =================================================================== --- /extensions/FacebookPlug/Plugin/include/conf.inc.php (revision 8274) +++ /extensions/FacebookPlug/Plugin/include/conf.inc.php (revision 8275) @@ -26,5 +26,5 @@ global $conf; -$conf['fbp'] = array_merge( +/*$conf['fbp'] = array_merge( // default values array @@ -53,5 +53,44 @@ ), unserialize($conf['fbp']) - ); + );*/ + +$conf['fbp'] = array_merge( + // default values + array + ( + 'allow_fb_access_private_page' => true, + 'async_script' => false, + 'social_plugin_like_button' => array(), + 'social_plugin_like_box' => array(), + ), + unserialize($conf['fbp'])); + +$conf['fbp']['social_plugin_like_button'] = array_merge( + // default values + array + ( + 'enabled' => true, + 'url_type' => 'page', + 'layout' => 'standard', + 'show_faces' => true, + 'action' => 'like', + 'colorscheme' => 'dark', + 'width' => '', + ), + $conf['fbp']['social_plugin_like_button']); + +$conf['fbp']['social_plugin_like_box'] = array_merge( + // default values + array + ( + 'enabled' => false, + 'url' => 'http://www.facebook.com/Piwigo', + 'colorscheme' => 'dark', + 'show_faces' => true, + 'stream' => true, + 'header' => true, + 'width' => '210', + ), + $conf['fbp']['social_plugin_like_box']); //~ print_r($conf['fbp']); Index: /extensions/FacebookPlug/Plugin/include/constants.inc.php =================================================================== --- /extensions/FacebookPlug/Plugin/include/constants.inc.php (revision 8274) +++ /extensions/FacebookPlug/Plugin/include/constants.inc.php (revision 8275) @@ -26,4 +26,5 @@ define('FACEBOOK_APP_ID', '111499825588662'); define('FBP_DIR', dirname(dirname(__FILE__))); +define('FBP_PATH' , PHPWG_PLUGINS_PATH.basename(FBP_DIR)); define('FBP_IP_FB', '66.220.'); Index: /extensions/FacebookPlug/Plugin/include/header.inc.php =================================================================== --- /extensions/FacebookPlug/Plugin/include/header.inc.php (revision 8275) +++ /extensions/FacebookPlug/Plugin/include/header.inc.php (revision 8275) @@ -0,0 +1,67 @@ +'; + //~ return preg_replace('#'.$search.'#', $fbp_content.$search, $content); +} + +function fbp_init() +{ + global $template, $user, $page, $conf, $picture; + + // set prefilter + $template->set_prefilter('header', 'fbp_header'); + + $template->assign('FACEBOOK_APP_ID', FACEBOOK_APP_ID); + // define language + $template->assign('LANGUAGE', $user['language']); + $template->assign('fbp', $conf['fbp']); + $template->smarty->register_modifier('boolean_to_string', 'boolean_to_string'); + + $template->set_filename('init.fb', FBP_DIR.'/tpl/init.fb.tpl'); + $template->append('head_elements', $template->parse('init.fb', true)); + + $template->block_html_head('', '', $smarty, $repeat); +} + + +if ($conf['fbp']['social_plugin_like_button']['enabled'] or $conf['fbp']['social_plugin_like_box']['enabled']) +{ + add_event_handler('init', 'fbp_init'); +} + +?> Index: /extensions/FacebookPlug/Plugin/include/index.inc.php =================================================================== --- /extensions/FacebookPlug/Plugin/include/index.inc.php (revision 8275) +++ /extensions/FacebookPlug/Plugin/include/index.inc.php (revision 8275) @@ -0,0 +1,73 @@ +set_filename('social.plugin.like.box', FBP_DIR.'/tpl/social.plugin.like.box.tpl'); + + //~ $template->assign_var_from_handle('PLUGIN_INDEX_CONTENT_BEFORE', 'social.plugin.like.box'); + //~ $template->assign_var_from_handle('PLUGIN_INDEX_CONTENT_BEGIN', 'social.plugin.like.box'); + $template->assign_var_from_handle('PLUGIN_INDEX_CONTENT_END', 'social.plugin.like.box'); + //~ $template->assign_var_from_handle('PLUGIN_INDEX_CONTENT_AFTER', 'social.plugin.like.box'); + + //~ $template->set_filename('social.plugin.like.box', FBP_DIR.'/tpl/social.plugin.like.box.tpl'); + //~ $content .= $template->parse('social.plugin.like.box', true); +}*/ + +function fbp_blockmanager_register_blocks( $menu_ref_arr ) +{ + $menu = & $menu_ref_arr[0]; + if ($menu->get_id() != 'menubar') + return; + $menu->register_block( new RegisteredBlock( 'mbFBP', 'social.plugin.like.box', 'FacebookPlug')); +} + +function fpt_blockmanager_apply($menu_ref_arr) +{ + global $template; + + $menu = & $menu_ref_arr[0]; + + if ($block = $menu->get_block('mbFBP')) + { + $template->set_template_dir(FBP_DIR.'/tpl/'); + $block->template = 'social.plugin.like.box.tpl'; + } +} + + +if ($conf['fbp']['social_plugin_like_box']['enabled']) +{ + //~ add_event_handler('loc_begin_index', 'fbp_loc_begin_index'); + add_event_handler('blockmanager_register_blocks', 'fbp_blockmanager_register_blocks', EVENT_HANDLER_PRIORITY_NEUTRAL); + add_event_handler('blockmanager_apply', 'fpt_blockmanager_apply'); +} + +?> Index: /extensions/FacebookPlug/Plugin/include/picture.inc.php =================================================================== --- /extensions/FacebookPlug/Plugin/include/picture.inc.php (revision 8274) +++ /extensions/FacebookPlug/Plugin/include/picture.inc.php (revision 8275) @@ -24,5 +24,8 @@ } -function fbp_header($content, &$smarty) +include_once(FBP_DIR.'/include/common.inc.php'); +include_once(FBP_DIR.'/include/header.inc.php'); + +/*function fbp_header($content, &$smarty) { global $conf; @@ -38,7 +41,7 @@ $search = '