joshtronic/leaderbin
1
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:joshtronic/leaderbin.com

Browse source 
Conflicts:
	public/index.php
This commit is contained in:
Josh Sherman 2014-08-03 19:37:56 -04:00
commit c3ef494ded
4 changed files with 29 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
modules/leaderboard/edit.php
View file

@ -1,14 +1,30 @@
<?php
class leaderboard_edit extends leaderboard_new
class leaderboard_edit extends leaderboards
{
public function __default()
{
// Looks up the leaderboard by UID
try
{
$return = parent::__default();
$leaderboards = $return['leaderboards'];
// Checks that the leaderboard is owned by this user
if (!isset($_GET['uid']))
{
throw new Exception('Missing UID.');
}
// Returns the leaderboard
if (!isset($leaderboards[$_GET['uid']]))
{
throw new Exception('Leaderboard does not belong to you.');
}
return array('leaderboard' => $leaderboards[$_GET['uid']]);
}
catch (Exception $e)
{
exit($e->getMessage());
}
}
}

3
modules/user/authenticate.php
View file

@ -26,9 +26,8 @@ class user_authenticate extends AnonymousModule
if ($user['password'] == crypt($_POST['password'], $user['password']))
{
setcookie('__auth', base64_encode($uid . '|' . $user['auth']), time() + Time::YEAR, '/');
return array('status' => 'success', 'url' => '/leaderboards');
}
return array('status' => 'success', 'url' => '/leaderboards');
}
return array('error' => 'Invalid email address or password.');

2
public/js/jerky.min.js vendored
View file

@ -1,6 +1,6 @@
$(function(){jQuery().validate&&$("form").validate();$(".ajax [type=submit]").on("click",function(){if("readonly"!=$(this).attr("readonly")){var a=$(this).parents("form").get();$(".alert[generated], label.error",a).remove();if("undefined"==typeof $(a).valid||!0==$(a).valid()){if(void 0==typeof $(a).data("readonly")||!1!=$(a).data("readonly"))$("button, input, textarea",a).attr("readonly","readonly"),document.body.style.cursor="wait",$(this).hide(),$(this).after("<progress></progress>");var c=""==
$(a).attr("method")?"GET":$(a).attr("method"),d=$(a).attr("action");if(""==d)injectMessage(a,"Form element lacks action attribute","error"),$("button, input, textarea",a).removeAttr("readonly"),document.body.style.cursor="default",$("progress",a).remove(),$('[type="submit"]',a).show();else{var f=$(a).serialize(),e=void 0!=typeof $(a).data("readonly")&&!1==$(a).data("readonly");if(e){if(void 0!=typeof $(a).data("preprocessor"))window[$(a).data("preprocessor")]();$("input[type=text]",a).val("");$("select",
a).val("");$("textarea",a).val("");void 0!=typeof $(a).data("focus")&&$($(a).data("focus")).focus()}$.ajax({type:c,url:d,data:f,dataType:"json",success:function(b){"undefined"!=typeof b.success?(b.status="success",b.message=b.success):"undefined"!=typeof b.error&&(b.status="error",b.message=b.error);if("success"!=b.status&&"undefined"!=typeof b.message)injectMessage(a,b.message,"error");else if("success"==b.status){if(("undefined"==typeof b.retain||!1==b.retain)&&!e)$("input[type=text]",a).val(""),
a).val("");$("textarea",a).val("");void 0!=typeof $(a).data("focus")&&$($(a).data("focus")).focus()}$.ajax({type:c,url:d,data:f,dataType:"json",success:function(b,c,d){"undefined"!=typeof b.success?(b.status="success",b.message=b.success):"undefined"!=typeof b.error&&(b.status="error",b.message=b.error);if("success"!=b.status&&"undefined"!=typeof b.message)injectMessage(a,b.message,"error");else if("success"==b.status){if(("undefined"==typeof b.retain||!1==b.retain)&&!e)$("input[type=text]",a).val(""),
$("input[type=email]",a).val(""),$("select",a).val(""),$("textarea",a).val("");"undefined"!=typeof b.message&&injectMessage(a,b.message,"success");"undefined"!=typeof b.url&&(parent.location.href=b.url)}if("undefined"!=typeof b.callback)window[b.callback](b);$("button, input, textarea",a).removeAttr("readonly");document.body.style.cursor="default";$("progress",a).remove();$('[type="submit"]',a).show()},error:function(b,c,d){injectMessage(a,d,"error");$("button, input, textarea",a).removeAttr("readonly");
document.body.style.cursor="default";$("progress",a).remove();$('[type="submit"]',a).show()}})}}else return!1}});$("form.ajax").submit(function(){return!1});$("table tr:even td").addClass("even");$("table tr:odd td").addClass("odd")});
function injectMessage(a,c,d,f){"undefined"==typeof d&&(d="error");var e="alert-"+Date.now();c='<label id="'+e+'" class="'+("alert "+d)+'" generated="generated">'+c+"</label>";$(".alert[generated]",a).remove();$(a).hasClass("box")||$(a).parent(".two-column")?$('[type="submit"]',a).before(c):$(a).prepend(c);e="#"+e;"undefined"!=typeof f&&$(e,a).delay(f).remove();return $(e,a)}function autoTab(a){$(a).val().length>=$(a).attr("maxlength")&&$(a).next().focus()}

7
templates/api.phtml
View file

@ -35,6 +35,13 @@ if ($this->module['api_key'])
<p class="lead"><span class="label label-primary"><?php echo $url; ?>{endpoint}?key={key}</span> where <span class="label label-primary">{endpoint}</span> is the call being made and <span class="label label-primary">{key}</span> is your API key.</p>
<h2>Results</h2>
<p class="lead">The <?php echo $site; ?> API only returns a JSON formatted string and utilizes both HTTP status codes as well as a <span class="label label-primary">response_code</span> variable in the results. On error, there will also be a <span class="label label-primary">error</span> variable that will contain additional information about the error that was encountered.</p>
<h3>Pretty Print</h3>
<p class="lead">To help with readability of the returned JSON we offer the <span class="label label-primary">pretty</span> parameter which will force the JSON output to be prettified. Simply add <span class="label label-primary">&amp;pretty=true</span> after your <span class="label label-primary">key</span> to use this parameter.</p>
<h2>Endpoints</h2>