diff --git a/INSTALL.md b/INSTALL.md index b36d8d3..8da9c4a 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,4 +1,5 @@ # SMBind-ng Installation Guide +v0.91c ## Requirements * Any kind of webserver with php usage abilities (tested on apache2, lighttpd, diff --git a/config/config.php b/config/config.php index e1a845c..161bfa8 100644 --- a/config/config.php +++ b/config/config.php @@ -1,10 +1,22 @@ PRIMARY site - Switch to SECONDARY site | You are from: ' . $_SERVER['REMOTE_ADDR'] . ''; +$_CONF['recaptcha'] = true; +$_CONF['rc_pubkey'] = '6LectQcTAAAAAGLTGJQpjM8eh8YEozuXYFqpLDqG'; +$_CONF['rc_privkey'] = '6LectQcTAAAAAGBDl7u5lrbVQmNYtlF37K2RkArR'; +$_CONF['nocaptcha'] = array ( + '78.131.57.83', + '194.149.54.36', + ); +$_CONF['path'] = '/etc/smbind/zones/'; +$_CONF['conf'] = '/etc/smbind/smbind.conf'; +$_CONF['rollerconf'] = '/etc/smbind/rollrec/zones.rollrec'; ?> diff --git a/lib/smbind.class.php b/lib/smbind.class.php index 0876a7e..3c4c6b4 100644 --- a/lib/smbind.class.php +++ b/lib/smbind.class.php @@ -211,7 +211,8 @@ if (is_string($path)) { $_CONF['smbind_ng'] = $path; $_CONF['title'] = "SMBind-ng"; - $_CONF['footer'] = $_CONF['title'] . " v0.91b"; + $_CONF['version'] = 'v0.91c'; + $_CONF['footer'] = $_CONF['title'] . $_CONF['version']; $_CONF['marker'] = "Forked by PtY 2015(GPL)"; $_CONF['template'] = "default"; $_CONF['recaptcha'] = false; diff --git a/src/include.php b/src/include.php index 4475021..c44d637 100644 --- a/src/include.php +++ b/src/include.php @@ -86,7 +86,7 @@ if (isset($_POST['username']) && isset($_POST['password']) && ($cap_rsp == NULL) } $user = new User(); -$smarty->assign("loggedinuser",$user->getFullName()); +$smarty->assign("loggedinuser",preg_replace('/\s/', ' ', $user->getFullName())); if ($user->getId() == 0) { login_page($smarty); @@ -100,6 +100,7 @@ if ((isset($_SERVER['PHP_SELF'])) && (basename($_SERVER['PHP_SELF']) != 'index.p if($user->isAdmin()) { $smarty->assign("admin", "yes"); + $smarty->assign("version", $conf->version); } else { $smarty->assign("admin", "no"); } diff --git a/templates/main.tpl b/templates/main.tpl index b25f5a3..95eb5d9 100644 --- a/templates/main.tpl +++ b/templates/main.tpl @@ -2,4 +2,4 @@
{$TITLE}

{$pagetitle}

{include file="menu.tpl"}{include file=$template}

{$help}

-{if $loggedinuser}
Logged in as: {$loggedinuser}
{/if}{include file="footer.tpl"} +{if $loggedinuser}
Logged in as: {$loggedinuser}{if $admin} | App engine: {$version}{/if}
{/if}{include file="footer.tpl"}