mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 11:50:30 +02:00
Code Issues Releases Wiki Activity

Preparations for e107.org login.

Browse Source
This commit is contained in:
Cameron
2013-05-19 15:02:05 -07:00
parent 67c55ffbd3
commit c2776f84d2
3 changed files with 110 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_admin/theme.php
View File

@@ -73,6 +73,12 @@ if(e_AJAX_REQUEST)
{
switch ($_GET['action'])
{
case 'login':
$mp = $themec->getMarketplace();
echo $mp->renderLoginForm();
exit;
break;
case 'download':
$string = base64_decode($_GET['src']);
parse_str($string, $p);

90
e107_handlers/e_marketplace.php
View File

@@ -38,6 +38,10 @@ class e_marketplace
*/
public function generateAuthKey($username, $password)
{
if(trim($username) == '' || trim($password) == '')
{
return false;
}
$this->setAuthKey($this->makeAuthKey($username, $password, true));
return $this;
}
@@ -65,6 +69,92 @@ class e_marketplace
if($plain && !empty($password)) $password = md5($password);
return sha1($username.$password.$now);
}
/**
* Have the admin enter their e107.org login details in order to create the authorization key.
*/
public function renderLoginForm()
{
$text = '
<div class="" id="loginModal">
<div class="well">
<img src="'.e_IMAGE_ABS.'admin_images/credits_logo.png" alt="" style="margin-bottom:15px" />
<ul class="nav nav-tabs">
<li class="active"><a href="#login" data-toggle="tab">Login</a></li>
<li><a href="#create" data-toggle="tab">Create Account</a></li>
</ul>
<div id="myTabContent" class="tab-content">
<div class="tab-pane active in" id="login">
<form class="form-horizontal" action="" method="POST">
<fieldset>
<div id="legend">
<legend class="">Login</legend>
</div>
<div class="control-group">
<label class="control-label" for="username">Username</label>
<div class="controls">
<input type="text" id="username" name="username" placeholder="" class="input-xlarge">
</div>
</div>
<div class="control-group">
<label class="control-label" for="password">Password</label>
<div class="controls">
<input type="password" id="password" name="password" placeholder="" class="input-xlarge">
</div>
</div>
<div class="control-group">
<div class="controls">
<button class="btn btn-success">Login</button>
</div>
</div>
</fieldset>
</form>
</div>';
//TODO Use Form handler for INPUT tags.
//XXX TBD OR do we just redirect to the signup page on the website, in an iframe?
$text .= '
<div class="tab-pane fade" id="create">
<form class="form-horizontal" id="tab">
<div class="control-group">
<label class="control-label">Username</label>
<div class="controls">
<input type="text" value="" class="input-xlarge">
</div>
</div>
<div class="control-group">
<label class="control-label">Password</label>
<div class="controls">
<input type="password" value="" class="input-xlarge">
</div>
</div>
<div class="control-group">
<label class="control-label">Email</label>
<div class="controls">
<input type="text" value="" class="input-xlarge">
</div>
</div>
<div class="control-group">
<div class="controls">
<button class="btn btn-primary">Create Account</button>
</div>
</div>
</form>
</div>
</div>
</div>
';
return $text;
}
/**
* Retrieve currently used adapter

16
e107_handlers/theme_handler.php
View File

@@ -1032,11 +1032,23 @@ class themeHandler
$id = $frm->name2id($theme['name']);
$LAN_DOWNLOAD = ($theme['price'] > 0) ? "Buy/Download" : "Download";
$downloadUrl = e_SELF.'?action=download&amp;src='.base64_encode($d);//$url.'&amp;action=download';
if($this->mp->hasAuthKey())
{
$action = 'download';
$caption = "Downloading ".$theme['name']." ".$theme['version'];
}
else
{
$action = 'login';
$caption = "Please login to your e107.org account to proceed..";
}
$downloadUrl = e_SELF.'?action='.$action.'&amp;src='.base64_encode($d);//$url.'&amp;action=download';
$infoUrl = $url.'&amp;action=info';
//$main_icon = "<a data-src='".$downloadUrl."' href='{$downloadUrl}' data-target='{$id}' data-loading='".e_IMAGE."/generic/loading_32.gif' class='-e-ajax' title='".$LAN_DOWNLOAD."' ><img class='top' src='".e_IMAGE_ABS."icons/download_32.png' alt='' /></a> ";
$main_icon = "<a data-toggle='modal' data-modal-caption=\"Downloading ".$theme['name']." ".$theme['version']."\" href='{$downloadUrl}' data-cache='false' data-target='#uiModal' title='".$LAN_DOWNLOAD."' ><img class='top' src='".e_IMAGE_ABS."icons/download_32.png' alt='' /></a> ";
$main_icon = "<a data-toggle='modal' data-modal-caption=\"".$caption."\" href='{$downloadUrl}' data-cache='false' data-target='#uiModal' title='".$LAN_DOWNLOAD."' ><img class='top' src='".e_IMAGE_ABS."icons/download_32.png' alt='' /></a> ";
$info_icon = "<a data-toggle='modal' data-modal-caption=\"".$theme['name']." ".$theme['version']."\" href='".$infoUrl."' data-cache='false' data-target='#uiModal' title='".TPVLAN_7."'>".trim(E_32_CAT_ABOUT)."</a>";
if($theme['livedemo'])