RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'next' of https://github.com/TheSerapher/php-mpos into next

Browse Source
This commit is contained in:
Sebastian Grewe 2013-11-25 09:15:39 +01:00
commit 80c6d2cf6e
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
public/include/pages/statistics/blockfinder.inc.php
View File

@ -6,21 +6,24 @@ if (!defined('SECURITY')) die('Hacking attempt');
// Grab Block Finder // Grab Block Finder
if (!$smarty->isCached('master.tpl', $smarty_cache_key)) { if (!$smarty->isCached('master.tpl', $smarty_cache_key)) {
$debug->append('No cached version available, fetching from backend', 3); $debug->append('No cached version available, fetching from backend', 3);
$getBlocksSolvedbyAccount = $statistics->getBlocksSolvedbyAccount(); $getBlocksSolvedbyAccount = $statistics->getBlocksSolvedbyAccount();
$smarty->assign("BLOCKSSOLVEDBYACCOUNT", $getBlocksSolvedbyAccount); $smarty->assign("BLOCKSSOLVEDBYACCOUNT", $getBlocksSolvedbyAccount);
if(isset($_SESSION['USERDATA']['id'])){
$getBlocksSolvedbyWorker = $statistics->getBlocksSolvedbyWorker($_SESSION['USERDATA']['id']);
$smarty->assign("BLOCKSSOLVEDBYWORKER", $getBlocksSolvedbyWorker);
}
} else { } else {
$debug->append('Using cached page', 3); $debug->append('Using cached page', 3);
} }
// Public / private page detection
if ($setting->getValue('acl_blockfinder_statistics')) { if ($setting->getValue('acl_blockfinder_statistics')) {
$smarty->assign("CONTENT", "finder.tpl"); $smarty->assign("CONTENT", "finder.tpl");
} else if ($user->isAuthenticated()) { } else if ($user->isAuthenticated()) {
$getBlocksSolvedbyWorker = $statistics->getBlocksSolvedbyWorker($_SESSION['USERDATA']['id']);
$smarty->assign("BLOCKSSOLVEDBYWORKER", $getBlocksSolvedbyWorker);
$smarty->assign("CONTENT", "finder.tpl"); $smarty->assign("CONTENT", "finder.tpl");
} else { } else {
$_SESSION['POPUP'][] = array('CONTENT' => 'Block Finders are currently disabled. Please try again later.', 'TYPE' => 'errormsg');
$smarty->assign("CONTENT", "default.tpl"); $smarty->assign("CONTENT", "default.tpl");
} }
?> ?>

6
public/templates/mpos/contactform/default.tpl
View File

@ -6,15 +6,15 @@
<div class="module_content"> <div class="module_content">
<fieldset> <fieldset>
<label for="senderName">Your Name</label> <label for="senderName">Your Name</label>
<input type="text" class="text tiny" name="senderName" value="{$smarty.request.senderName|escape|default:""}" placeholder="Please type your name" size="15" maxlength="20" required /> <input type="text" class="text tiny" name="senderName" value="{$smarty.request.senderName|escape|default:""}" placeholder="Please type your name" size="15" maxlength="100" required />
</fieldset> </fieldset>
<fieldset> <fieldset>
<label for="senderEmail">Your Email Address</label> <label for="senderEmail">Your Email Address</label>
<input type="text" class="text tiny" name="senderEmail" value="{$smarty.request.senderEmail|escape|default:""}" placeholder="Please type your email" size="50" maxlength="50" required /> <input type="text" class="text tiny" name="senderEmail" value="{$smarty.request.senderEmail|escape|default:""}" placeholder="Please type your email" size="50" maxlength="100" required />
</fieldset> </fieldset>
<fieldset> <fieldset>
<label for="senderEmail">Your Subject</label> <label for="senderEmail">Your Subject</label>
<input type="text" class="text tiny" name="senderSubject" value="{$smarty.request.senderSubject|escape|default:""}" placeholder="Please type your subject" size="15" maxlength="20" required /> <input type="text" class="text tiny" name="senderSubject" value="{$smarty.request.senderSubject|escape|default:""}" placeholder="Please type your subject" size="15" maxlength="100" required />
</fieldset> </fieldset>
<fieldset> <fieldset>
<label for="message">Your Message</label> <label for="message">Your Message</label>