+
@@ -129,9 +140,9 @@ class Render
/**
* Add the given template to the output, using the given params for placeholders in the template
*/
- public static function addTemplate($template, $params = false)
+ public static function addTemplate($template, $params = false, $module = false)
{
- self::$body .= self::parse($template, $params);
+ self::$body .= self::parse($template, $params, $module);
}
/**
@@ -148,7 +159,7 @@ class Render
'title' => $title,
'next' => $next,
'body' => self::parse($template, $params)
- ));
+ ), 'main');
}
/**
@@ -164,15 +175,19 @@ class Render
* @param string $template name of template, relative to templates/, without .html extension
* @return string Rendered template
*/
- public static function parse($template, $params = false)
+ public static function parse($template, $params = false, $module = false)
{
// Load html snippet
- $html = self::getTemplate($template);
+ $html = self::getTemplate($template,$module);
if ($html === false) {
return '
',
+ self::$dashboard
+ ,
self::$body
,
'
+ Template ' . htmlspecialchars($template) . '
' . nl2br(htmlspecialchars(print_r($params, true))) . ''; } // Get all translated strings for this template - $dictionary = Dictionary::getArrayTemplate($template); + if($module === false){ + $module = strtolower(empty($_REQUEST['do']) ? 'main' : $_REQUEST['do']); + } + $dictionary = Dictionary::getArrayTemplate($template, $module); + // Now find all language tags in this array preg_match_all('/{{(lang_.+?)}}/', $html, $out); foreach ($out[1] as $tag) { @@ -183,7 +198,7 @@ class Render // Always add token to parameter list if (is_array($params) || $params === false || is_null($params)) $params['token'] = Session::get('token'); - // Likewise, add currently selected language (its two letter code) to params + // Likewise, add currently selected language ( its two letter code) to params $params['current_lang'] = LANG; // Add desired password field type $params['password_type'] = Property::getPasswordFieldType(); @@ -224,15 +239,66 @@ class Render /** * Private helper: Load the given template and return it */ - private static function getTemplate($template) + private static function getTemplate($template, $module = false) { if (isset(self::$templateCache[$template])) { return self::$templateCache[$template]; } + // Select current module + if(!$module){ + $module = strtolower(empty($_REQUEST['do']) ? 'Main' : $_REQUEST['do']); + } // Load from disk - $data = @file_get_contents('templates/' . $template . '.html'); + $data = @file_get_contents('modules/' . $module . '/templates/' . $template . '.html'); + if ($data === false) + $data = 'Non-existent template ' . $template . ' requested!'; self::$templateCache[$template] = & $data; return $data; } + /** + * Create the dashboard menu + */ + private static function createDashboard($page) + { + // Check all required modules + $requiredModules = array('adduser','main','session','translation','usermanagement'); + $notFound = ''; + foreach ($requiredModules as $module) { + if(!is_dir('modules/' . $module . '/')){ + $notFound .= '\'' . $module . '\' '; + } + } + if(strlen($notFound) > 0){ + Util::traceError('At least one required module was not found: ' . $notFound); + }else{ + $modules = array_diff(scandir('modules/'), array('..', '.')); + $categories = array(); + foreach ($modules as $module) { + $json = json_decode(file_get_contents("modules/" . $module . "/config.json"),true); + $categories[$json['category']][] = $module; + } + unset($categories['hidden']); + self::$dashboard = '
';
+ }
+ }
+
+ /**
+ * get categories glyph icons
+ */
+ private static function getGlyphicon($category){
+ return json_decode(file_get_contents("style/categories.json"),true)[$category];
+ }
+
}
diff --git a/inc/taskmanagercallback.inc.php b/inc/taskmanagercallback.inc.php
index efa5aacd..cec763fb 100644
--- a/inc/taskmanagercallback.inc.php
+++ b/inc/taskmanagercallback.inc.php
@@ -116,13 +116,6 @@ class TaskmanagerCallback
EventLog::warning("Could not generate Active Directory configuration", $task['data']['error']);
}
- public static function cbIpxeBuilt($task)
- {
- if (Taskmanager::isFailed($task)) {
- EventLog::warning("Could not recompile iPXE menu.", $task['data']['error']);
- }
- }
-
/**
* Generating a config module has finished.
*
diff --git a/inc/trigger.inc.php b/inc/trigger.inc.php
index 0f7e1b13..353d6d69 100644
--- a/inc/trigger.inc.php
+++ b/inc/trigger.inc.php
@@ -15,6 +15,7 @@ class Trigger
* Compile iPXE pxelinux menu. Needs to be done whenever the server's IP
* address changes.
*
+ * @param boolean $force force recompilation even if it seems up to date
* @return boolean|string false if launching task failed, task-id otherwise
*/
public static function ipxe()
diff --git a/inc/user.inc.php b/inc/user.inc.php
index 111849fe..d3cdc65a 100644
--- a/inc/user.inc.php
+++ b/inc/user.inc.php
@@ -12,6 +12,13 @@ class User
return self::$user !== false;
}
+ public static function getId()
+ {
+ if (!self::isLoggedIn())
+ return false;
+ return self::$user['userid'];
+ }
+
public static function getName()
{
if (!self::isLoggedIn())
@@ -58,6 +65,7 @@ class User
public static function logout()
{
+ error_log("in logout");
Session::delete();
Header('Location: ?do=Main&fromlogout');
exit(0);
@@ -81,4 +89,19 @@ class User
return self::$user['lasteventid'];
}
+ public static function addUser($data){
+ Database::exec ( "INSERT INTO user SET login = :login, passwd = :pass, fullname = :name, phone = :phone, email = :email, permissions = 4", $data );
+ $ret = Database::queryFirst('SELECT userid FROM user WHERE login = :user LIMIT 1', array('user' => $data['login']));
+ $user = array(
+ 'user' => $ret['userid']
+ );
+ Database::exec ( "INSERT INTO setting_partition SET partition_id = '44', size = '5G', mount_point = '/tmp', user = :user", $user );
+ Database::exec ( "INSERT INTO setting_partition SET partition_id = '43', size = '20G', mount_point = '/boot', options = 'bootable', user = :user", $user );
+ Database::exec ( "INSERT INTO setting_partition SET partition_id = '40', size = '20G', mount_point = '/cache/export/dnbd3', user = :user", $user );
+ Database::exec ( "INSERT INTO setting_partition SET partition_id = '41', size = '5G', mount_point = '/home', user = :user", $user );
+ Database::exec ( "INSERT INTO setting_partition SET partition_id = '82', size = '1G', user = :user", $user );
+ Message::addSuccess('add-user');
+ EventLog::info ( User::getName () . ' created user ' . $data['login'] );
+ }
+
}
--
cgit v1.2.3-55-g7522