#1 Social Auth with hybridauth.sourceforge.net

easy-wi · Feb 20, 2014 · 9cf71b9 · 9cf71b9
1 parent b8be898
commit 9cf71b9
Show file tree

Hide file tree

Showing 69 changed files with 15,633 additions and 253 deletions.
diff --git a/THIRDPARTY b/THIRDPARTY
@@ -38,8 +38,15 @@ https://github.com/PHPMailer/PHPMailer
 GNU Lesser General Public License (LGPL), Version 2.1
 http://www.gnu.org/licenses/lgpl-2.1.html
 
+* HybridAuth
+http://hybridauth.sourceforge.net/
+GNU GENERAL PUBLIC LICENSE Version 3
+https://www.gnu.org/licenses/gpl.html
+Released under the MIT license
+http://opensource.org/licenses/MIT
+
 
-Used but included with CDN servers:
+ Used but included with CDN servers:
 
 * Bootstrap v2.3.2
 http://getbootstrap.com/2.3.2/

diff --git a/web/css/default/social_buttons.css b/web/css/default/social_buttons.css
diff --git a/web/languages/default/de/login.xml b/web/languages/default/de/login.xml
@@ -11,6 +11,9 @@
     <ipBad>Inkorrekte IP: </ipBad>
     <ipOK>Erlaubte IP(s) ist/sind </ipOK>
 	<linkexpired>Link ist abgelaufen.</linkexpired>
+    <multipleHeader>Mehrere Benutzer gefunden</multipleHeader>
+    <multipleHelper>Es wurden mehrere Benutzer zu dem Login von %sp% gefunden. Bitte wählen einen aus</multipleHelper>
+    <multipleHelperEndpoint>Im Regelfall muss eine App bei dem jeweiligen Service Provider angelegt werden. Beim Erstellen der App erhält man einen Key und Zugangstoken, die beide in Easy-WI hinterlegt werden müssen. In der App muss meistens der Endpunkt des SocialAuth definiert werden. Dieser ist bei Easy-Wi %url%</multipleHelperEndpoint>
 	<nouser>Ein Benutzer mit diesem Namen, oder Email existiert nicht.</nouser>
 	<password>Passwort</password>
 	<passwordr>Passwort vergessen?</passwordr>

diff --git a/web/languages/default/de/user.xml b/web/languages/default/de/user.xml
@@ -73,6 +73,9 @@
 	<serverdata>Installierte Server</serverdata>
 	<settings>Panel Einstellungen</settings>
 	<shown>Ergebnisse je Seite</shown>
+    <socialConnect>Verknüpfung herstellen mit</socialConnect>
+    <socialRemove>Verknüpfung entfernen mit</socialRemove>
+    <socialSignin>Einloggen mit</socialSignin>
 	<stadt>Stadt</stadt>
 	<str>Straße</str>
 	<switch>Zum Benutzer wechseln</switch>

diff --git a/web/languages/default/dk/login.xml b/web/languages/default/dk/login.xml
@@ -11,6 +11,9 @@
     <ipBad>Forkert IP: </ipBad>
     <ipOK>Tilladt IP'er </ipOK>
 	<linkexpired>Link er udløbet.</linkexpired>
+    <multipleHeader>Multiple users found</multipleHeader>
+    <multipleHelper>Multiple users could be found connected to the login for %sp%. Please pick one.</multipleHelper>
+    <multipleHelperEndpoint>Usually you will have to register an app at the service provider. During creating you will be provided with a key and access token. Both need to be entered at Easy-Wi. At the app you need to configure an endpoint. The endpoint for Easy-Wi is %url%</multipleHelperEndpoint>
 	<nouser>En bruger med det indtastede navn eller email eksisterer ikke.</nouser>
 	<password>Adgangskode</password>
 	<passwordr>Adgangskode genopretning</passwordr>

diff --git a/web/languages/default/dk/user.xml b/web/languages/default/dk/user.xml
@@ -73,6 +73,9 @@
 	<serverdata>Installerede servere</serverdata>
 	<settings>Panelindstillinger</settings>
 	<shown>Resultater pr side</shown>
+    <socialConnect>Connect with</socialConnect>
+    <socialRemove>Remove connection with</socialRemove>
+    <socialSignin>Sign in with</socialSignin>
 	<stadt>By</stadt>
 	<str>Gade</str>
 	<switch>Skift til bruger</switch>

diff --git a/web/languages/default/uk/login.xml b/web/languages/default/uk/login.xml
@@ -11,6 +11,9 @@
     <ipBad>Incorrect IP: </ipBad>
     <ipOK>Permitted IP(s) is/are </ipOK>
 	<linkexpired>Link is expired.</linkexpired>
+    <multipleHeader>Multiple users found</multipleHeader>
+    <multipleHelper>Multiple users could be found connected to the login for %sp%. Please pick one.</multipleHelper>
+    <multipleHelperEndpoint>Usually you will have to register an app at the service provider. During creating you will be provided with a key and access token. Both need to be entered at Easy-Wi. At the app you need to configure an endpoint. The endpoint for Easy-Wi is %url%</multipleHelperEndpoint>
 	<nouser>A user with the entered name or email does not exist.</nouser>
 	<password>Password</password>
 	<passwordr>Passwort Recovery</passwordr>

diff --git a/web/languages/default/uk/user.xml b/web/languages/default/uk/user.xml
@@ -73,6 +73,9 @@
 	<serverdata>Installed Servers</serverdata>
 	<settings>Panel Settings</settings>
 	<shown>Results per page</shown>
+    <socialConnect>Connect with</socialConnect>
+    <socialRemove>Remove connection with</socialRemove>
+    <socialSignin>Sign in with</socialSignin>
 	<stadt>Town</stadt>
 	<str>Street</str>
 	<switch>Switch to user</switch>