suzanne.soy/2011-m1s2-ter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

La connexion marche à merveille :)

Browse Source
This commit is contained in:
Georges Dupéron 2011-05-20 11:51:08 +02:00
parent 6a4d689226
commit d0e9b2f56a
4 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
code/serveur/php/jeu.php
View File

@ -13,6 +13,7 @@
<script src="ressources/pticlic.js"></script>
<script src="server.php?callback=prefs.loadPrefs&action=7"></script>
<style>
img { border: none; }
body, html { margin: 0; padding: 0; height: 100%; overflow: hidden; }
.screen { width:100%; height:100%; position:absolute; }
.highlight { display:none; width:100%; height:100%; border-width:medium; border-style:solid; border-radius:2em; position:absolute; }
@ -151,12 +152,15 @@
</div>
<div id="connection" class="screen">
<form action="#" method="GET" style="width:100%; height:100%;" class="fitFontGroup">
<div class="formElement subFitFont" style="right: 55%; top: 25%;"><label id="user-label" for="user">Login : </label></div>
<div class="formElement subFitFont" style="left: 55%; top: 25%;"><input type="text" name="user" id="user" class="setFont" /></div>
<div class="formElement subFitFont" style="right: 55%; top: 50%;"><label id="passwd-label" for="passwd">Mot de passe : </label></div>
<div class="formElement subFitFont" style="left: 55%; top: 50%;"><input type="password" name="passwd" id="passwd" class="setFont" /></div>
<div class="formElement subFitFont" style="left: 25%; width:50%; top: 75%;">
<input type="submit" name="connect" id="connect" value="Se connecter" class="center setFont" />
<div class="formElement subFitFont" style="right: 55%; top: 25%; text-align:right;"><label id="user-label" for="user">Login : </label></div>
<div class="formElement subFitFont" style="left: 55%; top: 25%; text-align:left;"><input type="text" name="user" id="user" class="setFont" /></div>
<div class="formElement subFitFont" style="right: 55%; top: 50%; text-align:right;"><label id="passwd-label" for="passwd">Mot de passe : </label></div>
<div class="formElement subFitFont" style="left: 55%; top: 50%; text-align:left;"><input type="password" name="passwd" id="passwd" class="setFont" /></div>
<div class="formElement subFitFont" style="right: 55%; top: 75%; text-align:right;">
<input type="button" value="Retour" class="setFont goFrontpage" />
</div>
<div class="formElement subFitFont" style="left: 55%; top: 75%; text-align:left;">
<input type="submit" name="connect" id="connect" value="Se connecter" class="setFont" />
</div>
</form>
</div>

4
code/serveur/php/ressources/my-extensions.js
View File

@ -188,9 +188,9 @@ function encodeHash(data) {
}
function Cache(resolver) {
var cache = [];
var cache = {};
this.get = function(k) {
return cache[k] = cache[k] || $.Deferred(function(dfd) { resolver(k, dfd); }).fail(cache[k] = false).promise();
return cache[k] = cache[k] || $.Deferred(function(dfd) { resolver(k, dfd); }).fail(function() { cache[k] = false; }).promise();
};
}

44
code/serveur/php/ressources/pticlic.js
View File

@ -120,6 +120,11 @@ init(function() {
});
// ==== Écran d'accueil
init(function() {
$('.goFrontpage').click(function() { location.hash = "#frontpage"; });
});
// ==== Écran connexion
runstate.pendingGetPrefs = function() {
console.log('Should execute pendingGetPrefs');
@ -134,8 +139,8 @@ init(function() {
} else {
runstate.pendingGetPrefs();
}
if (state.screen == game) {
$('#game').trigger('pre-enter');
if (state.screen == 'game') {
$('#game').trigger('goto');
} else {
location.hash = "#frontpage";
}
@ -150,42 +155,37 @@ init(function() {
// ==== Écran game
$.ajaj = function(url, data, callback) {
var user = '' + UI().getPreference("user");
var passwd = '' + UI().getPreference("passwd");
if (user != '' && passwd != '') {
var user = runstate.user; /* '' + UI().getPreference("user"); */
var passwd = runstate.passwd; /* '' + UI().getPreference("passwd"); */
if (user && passwd) {
if (!data.user) data.user = user;
if (!data.passwd) data.passwd = passwd;
}
$.getJSON(url, data, callback);
console.log('ajaj', data, user, passwd);
return $.getJSON(url, data, callback);
};
function getGame(k, dfd, retry) {
function getGame(k, dfd) {
$.ajaj("getGame.php?callback=?", {pgid:k}, function(data) {
if (data.error == 10) {
if (data.isError) {
dfd.reject(data);
if (state.screen == 'game' && state.pgid == k) {
if (retry) {
$('#connection.screen').trigger('goto');
} else {
location.hash = "#frontpage";
message("Erreur", "Vous n'êtes pas connecté.");
}
}
} else if (data.isError) {
dfd.reject(data);
location.hash = "#frontpage";
message("Erreur", data.msg);
if ((data.error == 10 || data.error == 3) && state.screen == 'game' && state.pgid == k) {
$.screen('connection').trigger('goto');
} else {
$.screen('frontpage').trigger('goto');
}
} else {
dfd.resolve(data);
}
}).fail(function() {
}).fail(function(data) {
dfd.reject(data);
location.hash = "#frontpage";
$("#frontpage").trigger('goto');
message("Erreur", "Une erreur est survenue, veuillez nous en excuser.");
});
}
runstate.gameCache = new Cache(function(k, dfd) { getGame(k, dfd, true); });
runstate.gameCache = new Cache(function(k, dfd) { getGame(k, dfd); });
init(function() {
var game = $('#game.screen');

7
code/serveur/php/server.php
View File

@ -132,10 +132,13 @@ function server() {
ob_end_flush();
} catch (Exception $e) {
ob_end_clean();
$code = $e->getCode();
$msg = $e->getMessage();
if ($code != 10 && $code != 3) $msg = "Erreur ".$code." : " . $msg;
echo json_encode(
Array(
"error" => $e->getCode(),
"msg" => "Erreur ".$e->getCode()." : ".$e->getMessage(),
"error" => $code,
"msg" => $msg,
"isError" => true
)
);