Changeset 28826


Ignore:
Timestamp:
Jun 28, 2014, 6:21:12 PM (10 years ago)
Author:
mistic100
Message:

fix Yahoo, add 500px

Location:
extensions/oAuth
Files:
1 added
9 edited

Legend:

Unmodified
Added
Removed

  • extensions/oAuth/admin/template/providers.tpl

    r26608 r28826  
    8585    {if $provider.new_app_link}
    8686      <ol>
    87         <li>{'Go to <a href="%s" target="_blank">%s</a> and create a new application'|translate|sprintf:$provider.new_app_link:$provider.new_app_link}</li>
     87        <li>{'Go to <a href="%s" target="_blank">%s</a> and create a new application'|translate:$provider.new_app_link:$provider.new_app_link}</li>
    8888       
    8989      {if $p=='Google'}
    … …  
    9393      {/if}
    9494       
    95       {if $provider.callback}
     95      {if $provider.callback && $p!='Yahoo'}
    9696        <li>
    97           {assign var=callback value=$OAUTH_CALLBACK|cat:$p}
    98           {'Provide this URL as the Callback/Redirect URL for your application: <em>%s</em>'|translate|sprintf:$callback}
     97          {'Provide this URL as the Callback/Redirect URL for your application: <em>%s</em>'|translate:($OAUTH_CALLBACK|cat:$p)}
    9998        </li>
    10099      {/if}
    101100     
    102101      {if $p=='Live'}
    103         <li>{'Put your website domain in the %s fields. It should match with the current hostname: <em>%s</em>'|translate|sprintf:'<b>Redirect Domain</b>':$WEBSITE}</li>
     102        <li>{'Put your website domain in the %s fields. It should match with the current hostname: <em>%s</em>'|translate:'<b>Redirect Domain</b>':$WEBSITE}</li>
    104103      {elseif $p=='Facebook'}
    105104        <li>{'Go to <b>Settings->Advanced</b> and activate <em>Client OAuth Login</em>'|translate}</li>
    106         <li>{'Put your website domain in the %s fields. It should match with the current hostname: <em>%s</em>'|translate|sprintf:'<b>Valid OAuth redirect URIs</b>':$SERVERNAME}</li>
     105        <li>{'Put your website domain in the %s fields. It should match with the current hostname: <em>%s</em>'|translate:'<b>Valid OAuth redirect URIs</b>':$SERVERNAME}</li>
    107106      {elseif $p=='LinkedIn'}
    108         <li>{'Put your website domain in the %s fields. It should match with the current hostname: <em>%s</em>'|translate|sprintf:'<b>Website URL</b>':$WEBSITE}</li>
    109         <li>{'Set <b>%s</b> to <em>%s</em>'|translate|sprintf:'Application Type':'Web Application'}</li>
    110         <li>{'Set <b>%s</b> to <em>%s</em>'|translate|sprintf:'Default Scope':'r_basicprofile & r_emailaddress'}</li>
     107        <li>{'Put your website domain in the %s fields. It should match with the current hostname: <em>%s</em>'|translate:'<b>Website URL</b>':$WEBSITE}</li>
     108        <li>{'Set <b>%s</b> to <em>%s</em>'|translate:'Application Type':'Web Application'}</li>
     109        <li>{'Set <b>%s</b> to <em>%s</em>'|translate:'Default Scope':'r_basicprofile & r_emailaddress'}</li>
    111110      {elseif $p=='Yahoo'}
    112         <li>{'Put your website domain in the %s fields. It should match with the current hostname: <em>%s</em>'|translate|sprintf:'<b>Application URL</b>, <b>Application Domain</b>':$WEBSITE}</li>
    113         <li>{'Set <b>%s</b> to <em>%s</em>'|translate|sprintf:'Kind of Application':'Web-based'}</li>
    114         <li>{'Set <b>%s</b> to <em>%s</em>'|translate|sprintf:'Access Scopes':'This app will only access public...'}</li>
    115         <li>{'Once the application is registered update the permissions : set <b>Contacts</b> as <em>Read</em> and <b>Social Directory</b> as <em>Read Public</em>'|translate}</li>
     111        <li>{'Set <b>%s</b> to <em>%s</em>'|translate:'Kind of Application':'Web-based'}</li>
     112        <li>{'Set <b>%s</b> to <em>%s</em>'|translate:'Access Scopes':'This app requires access to private user data'}</li>
     113        <li>{'Provide this URL as the Callback/Redirect URL for your application: <em>%s</em>'|translate:($OAUTH_CALLBACK|cat:$p)}</li>
     114        <li>{'Select these APIs: <b>Contacts</b> as <em>Read</em> and <b>Social Directory</b> <em>Read Public</em>'|translate}</li>
    116115      {elseif $p=='Twitter'}
    117         <li>{'Put your website domain in the %s fields. It should match with the current hostname: <em>%s</em>'|translate|sprintf:'<b>Website</b>':$WEBSITE}</li>
     116        <li>{'Put your website domain in the %s fields. It should match with the current hostname: <em>%s</em>'|translate:'<b>Website</b>':$WEBSITE}</li>
    118117      {elseif $p=='Tumblr'}
    119         <li>{'Put your website domain in the %s fields. It should match with the current hostname: <em>%s</em>'|translate|sprintf:'<b>Application Website</b>':$WEBSITE}</li>
     118        <li>{'Put your website domain in the %s fields. It should match with the current hostname: <em>%s</em>'|translate:'<b>Application Website</b>':$WEBSITE}</li>
    120119      {elseif $p=='Instagram'}
    121         <li>{'Put your website domain in the %s fields. It should match with the current hostname: <em>%s</em>'|translate|sprintf:'<b>Website</b>':$WEBSITE}</li>
     120        <li>{'Put your website domain in the %s fields. It should match with the current hostname: <em>%s</em>'|translate:'<b>Website</b>':$WEBSITE}</li>
    122121      {elseif $p=='Google'}
    123         <li>{'Set <b>%s</b> to <em>%s</em>'|translate|sprintf:'Application Type':'Web Application'}</li>
    124         <li>{'Put your website domain in the %s fields. It should match with the current hostname: <em>%s</em>'|translate|sprintf:'<b>Authorized Javascript origins </b>':$SERVERNAME}</li>
     122        <li>{'Set <b>%s</b> to <em>%s</em>'|translate:'Application Type':'Web Application'}</li>
     123        <li>{'Put your website domain in the %s fields. It should match with the current hostname: <em>%s</em>'|translate:'<b>Authorized Javascript origins </b>':$SERVERNAME}</li>
     124      {elseif $p=='px500'}
     125        <li>{'Once the application is created, click <b>See application details</b>'|translate}</li>
    125126      {/if}
    126127     

  • extensions/oAuth/include/hybridauth/Hybrid/Providers/Yahoo.php

    r20293 r28826  
    2525
    2626                // Provider api end-points
    27                 $this->api->api_base_url      = 'http://social.yahooapis.com/v1/';
     27                $this->api->api_base_url      = 'https://social.yahooapis.com/v1/';
    2828                $this->api->authorize_url     = 'https://api.login.yahoo.com/oauth/v2/request_auth';
    2929                $this->api->request_token_url = 'https://api.login.yahoo.com/oauth/v2/get_request_token';

  • extensions/oAuth/include/providers_stats.inc.php

    r26608 r28826  
    99    'scope'             => 'email',
    1010  ),
    11  
    1211  'Google' => array(
    1312    'label'             => 'Google',
    … …  
    5150    'label'             => 'Yahoo',
    5251    'provider_name'     => 'Yahoo!',
     52    'callback'          => true,
    5353    'new_app_link'      => 'https://developer.apps.yahoo.com/projects/',
     54  ),
     55  'px500' => array(
     56    'label'             => '500px',
     57    'provider_name'     => '500px',
     58    'callback'          => true,
     59    'new_app_link'      => 'http://500px.com/settings/applications',
    5460  ),
    5561  'OpenID' => array(

  • extensions/oAuth/language/en_UK/help.lang.php

    r26608 r28826  
    1010$lang['Once you have registered, copy and past the created application credentials into this setup page'] = 'Once you have registered, copy and past the created application credentials into this setup page';
    1111$lang['No registration required'] = 'No registration required';
    12 $lang['Once the application is registered update the permissions : set <b>Contacts</b> as <em>Read</em> and <b>Social Directory</b> as <em>Read Public</em>'] = 'Once the application is registered update the permissions : set <b>Contacts</b> as <em>Read</em> and <b>Social Directory</b> as <em>Read Public</em>';
     12$lang['Select these APIs: <b>Contacts</b> as <em>Read</em> and <b>Social Directory</b> <em>Read Public</em>'] = 'Select these APIs: <b>Contacts</b> as <em>Read</em> and <b>Social Directory</b> <em>Read Public</em>';
    1313$lang['Go to <b>Settings->Advanced</b> and activate <em>Client OAuth Login</em>'] = 'Go to <b>Settings->Advanced</b> and activate <em>Client OAuth Login</em>';
    14 
    15 ?>
     14$lang['Once the application is created, click <b>See application details</b>'] = 'Once the application is created, click <b>See application details</b>';

  • extensions/oAuth/language/fr_FR/help.lang.php

    r26609 r28826  
    77$lang['Set <b>%s</b> to <em>%s</em>'] = 'Sélectionnez <em>%2$s</em> pour <b>%1$s</b>';
    88$lang['Once you have registered, copy and past the created application credentials into this setup page'] = 'Quand votre application est enregistrée, copiez-collez les clefs d\'authentification sur cette page';
    9 $lang['Once the application is registered update the permissions : set <b>Contacts</b> as <em>Read</em> and <b>Social Directory</b> as <em>Read Public</em>'] = 'Quand l\'application est enregistrée, éditez les permissions : sélectionnez <em>Read</em> pour <b>Contacts</b> et <em>Read Public</em> pour <b>Social Directory</b>';
    10 
     9$lang['Select these APIs: <b>Contacts</b> as <em>Read</em> and <b>Social Directory</b> <em>Read Public</em>'] = 'Sélectionnez ces permissions : <em>Read</em> pour <b>Contacts</b> et <em>Read Public</em> pour <b>Social Directory</b>';
    1110$lang['Based on OpenID'] = 'Basé sur OpenID';
    1211$lang['Go to <b>Settings->Advanced</b> and activate <em>Client OAuth Login</em>'] = 'Allez dans <b>Settings->Advanced</b> et activez <em>Client OAuth Login</em>';
    1312$lang['No registration required'] = 'Aucun enregistrement nécessaire';
    1413$lang['On the <b>APIs & auth -> Credentials</b> tab, <b>Create new client ID</b>'] = 'Sur la page <b>APIs & auth -> Credentials</b>, <b>Create new client ID</b>';
    15 ?>
     14$lang['Once the application is created, click <b>See application details</b>'] = 'Quand l\'application est créée, cliquez sur <b>See application details</b>';

  • extensions/oAuth/template/oauth_sprites.css

    r26605 r28826  
    1818.oauth_16px.steam { background-position: -176px 0px; }
    1919.oauth_16px.persona { background-position: -192px 0px; }
     20.oauth_16px.px500 { background-position: -208px 0px; }
    2021
    2122.oauth_26px {
    … …  
    3839.oauth_26px.steam { background-position: -286px 0px; }
    3940.oauth_26px.persona { background-position: -312px 0px; }
     41.oauth_26px.px500 { background-position: -338px 0px; }
    4042
    4143.oauth_38px {
    … …  
    5860.oauth_38px.steam { background-position: -418px 0px; }
    5961.oauth_38px.persona { background-position: -456px 0px; }
     62.oauth_38px.px500 { background-position: -494px 0px; }
Note: See TracChangeset for help on using the changeset viewer.