Basic layout and login functioning

This commit is contained in:
Deon George 2013-06-25 13:46:39 +10:00
parent 7e2cdac7e9
commit 15bd1fbb6e
7 changed files with 22 additions and 6 deletions

View File

@ -1,4 +1,4 @@
<?php defined('SYSPATH') or die('No direct access allowed.');
class Auth_LDAP extends PLA_Auth_Ldap {}
class Auth_LDAP extends PLA_Auth_LDAP {}
?>

View File

@ -96,7 +96,7 @@ class Config extends Kohana_Config {
}
public static function theme() {
return Kohana::$config->load('config')->theme;
return 'theme/'.Kohana::$config->load('config')->theme;
}
public static function version() {

View File

@ -0,0 +1,15 @@
<?php defined('SYSPATH') or die('No direct access allowed.');
/**
* This class overrides Kohana's Cookie
*
* @package PLA/Modifications
* @category Helpers
* @author Deon George
* @copyright (c) 2010 Deon George
* @license http://dev.phpldapadmin.org/license.html
*/
class Cookie extends Kohana_Cookie {
public static $salt = 'PLA';
}
?>

View File

@ -1,4 +1,5 @@
<?php defined('SYSPATH') or die('No direct access allowed.');
/**
* LDAP Auth driver.
*
@ -9,7 +10,7 @@
* @copyright (c) phpLDAPadmin Development Team
* @license http://dev.phpldapadmin.org/license.html
*/
class PLA_Auth_Ldap extends Auth {
class PLA_Auth_LDAP extends Auth {
// Unnused required abstract functions
public function password($username) {}
public function check_password($password) {}

View File

@ -15,7 +15,7 @@ abstract class PLA_Controller_Template extends Kohana_Controller_Template {
private $meta;
public function __construct(Request $request, Response $response) {
$this->template = Kohana::$config->load('config')->theme;
$this->template = Config::theme().'/page';
return parent::__construct($request,$response);
}

View File

@ -18,6 +18,6 @@ return array(
'mode' => Kohana::PRODUCTION,
// Our custom theme
'loginpage' => 'welcome',
'theme' => 'claro',
'theme' => 'bootstrap',
);
?>

@ -1 +1 @@
Subproject commit f96694b18fdaa9bd6310debca71427068fe24046
Subproject commit f5c623d89783fc9bf3c8dbea7699fcefa0015c3d