Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Michael Vogel 2012-12-17 10:33:17 +01:00
commit d032fa38ed
14 changed files with 6 additions and 6 deletions

Binary file not shown.

View file

@ -93,7 +93,7 @@ function altpager_settings(&$a,&$s) {
} }
function altpager_plugin_admin(&$a, &$o){ function altpager_plugin_admin(&$a, &$o){
$t = file_get_contents( $a->get_baseurl() . "/addon/altpager/admin.tpl" ); $t = file_get_contents( "addon/altpager/admin.tpl" );
$o = replace_macros($t, array( $o = replace_macros($t, array(
'$submit' => t('Submit'), '$submit' => t('Submit'),
'$global' => array('altpagerchoice', t('Global'), 1, t('Force global use of the alternate pager'), get_config('alt_pager', 'global') == 1), '$global' => array('altpagerchoice', t('Global'), 1, t('Force global use of the alternate pager'), get_config('alt_pager', 'global') == 1),

Binary file not shown.

View file

@ -239,7 +239,7 @@ function fbpost_content(&$a) {
$page_access_token = get_pconfig(local_user(),'facebook','page_access_token'); $page_access_token = get_pconfig(local_user(),'facebook','page_access_token');
$fb_token = get_pconfig($a->user['uid'],'facebook','access_token'); $fb_token = get_pconfig($a->user['uid'],'facebook','access_token');
$url = 'https://graph.facebook.com/me/accounts'; $url = 'https://graph.facebook.com/me/accounts';
$x = file_get_contents($url."?access_token=".$fb_token); $x = fetch_url($url."?access_token=".$fb_token);
$accounts = json_decode($x); $accounts = json_decode($x);
$o .= t("Post to page/group:")."<select name='post_to_page'>"; $o .= t("Post to page/group:")."<select name='post_to_page'>";
@ -257,7 +257,7 @@ function fbpost_content(&$a) {
} }
$url = 'https://graph.facebook.com/me/groups'; $url = 'https://graph.facebook.com/me/groups';
$x = file_get_contents($url."?access_token=".$fb_token); $x = fetch_url($url."?access_token=".$fb_token);
$groups = json_decode($x); $groups = json_decode($x);
foreach($groups->data as $group) { foreach($groups->data as $group) {

Binary file not shown.

View file

@ -288,7 +288,7 @@ function fromgplus_fetch($a, $uid) {
$account = get_pconfig($uid,'fromgplus','account'); $account = get_pconfig($uid,'fromgplus','account');
$key = get_config('fromgplus','key'); $key = get_config('fromgplus','key');
$result = file_get_contents("https://www.googleapis.com/plus/v1/people/".$account."/activities/public?alt=json&pp=1&key=".$key."&maxResults=".$maxfetch); $result = fetch_url("https://www.googleapis.com/plus/v1/people/".$account."/activities/public?alt=json&pp=1&key=".$key."&maxResults=".$maxfetch);
//$result = file_get_contents("google.txt"); //$result = file_get_contents("google.txt");
//file_put_contents("google.txt", $result); //file_put_contents("google.txt", $result);

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -39,7 +39,7 @@ function remote_permissions_settings(&$a,&$o) {
/* Add some HTML to the existing form */ /* Add some HTML to the existing form */
$t = file_get_contents( $a->get_baseurl() . "/addon/remote_permissions/settings.tpl" ); $t = file_get_contents("addon/remote_permissions/settings.tpl" );
$o .= replace_macros($t, array( $o .= replace_macros($t, array(
'$remote_perms_title' => t('Remote Permissions Settings'), '$remote_perms_title' => t('Remote Permissions Settings'),
'$remote_perms_label' => t('Allow recipients of your private posts to see the other recipients of the posts'), '$remote_perms_label' => t('Allow recipients of your private posts to see the other recipients of the posts'),
@ -190,7 +190,7 @@ function remote_permissions_content($a, $item_copy) {
} }
function remote_permissions_plugin_admin(&$a, &$o){ function remote_permissions_plugin_admin(&$a, &$o){
$t = file_get_contents( $a->get_baseurl() . "/addon/remote_permissions/admin.tpl" ); $t = file_get_contents( "addon/remote_permissions/admin.tpl" );
$o = replace_macros($t, array( $o = replace_macros($t, array(
'$submit' => t('Submit'), '$submit' => t('Submit'),
'$global' => array('remotepermschoice', t('Global'), 1, t('The posts of every user on this server show the post recipients'), get_config('remote_perms', 'global') == 1), '$global' => array('remotepermschoice', t('Global'), 1, t('The posts of every user on this server show the post recipients'), get_config('remote_perms', 'global') == 1),

Binary file not shown.

Binary file not shown.

Binary file not shown.