summaryrefslogtreecommitdiffstats
path: root/modules-available
diff options
context:
space:
mode:
Diffstat (limited to 'modules-available')
-rw-r--r--modules-available/main/install.inc.php11
-rw-r--r--modules-available/rebootcontrol/inc/rebootcontrol.inc.php1
-rw-r--r--modules-available/rebootcontrol/pages/exec.inc.php1
-rw-r--r--modules-available/session/hooks/cron.inc.php6
-rw-r--r--modules-available/sysconfig/addmodule_branding.inc.php2
-rw-r--r--modules-available/sysconfig/addmodule_custommodule.inc.php2
-rw-r--r--modules-available/sysconfig/addmodule_screensaver.inc.php2
-rw-r--r--modules-available/syslog/page.inc.php17
-rw-r--r--modules-available/vmstore/page.inc.php2
9 files changed, 29 insertions, 15 deletions
diff --git a/modules-available/main/install.inc.php b/modules-available/main/install.inc.php
index 92ad4db1..fe572487 100644
--- a/modules-available/main/install.inc.php
+++ b/modules-available/main/install.inc.php
@@ -48,6 +48,17 @@ $res[] = tableCreate('user', "
UNIQUE KEY `login` (`login`)
");
+$res[] = tableCreate('session', "
+ `sid` char(50) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+ `userid` int(10) unsigned NOT NULL,
+ `dateline` int(10) unsigned NOT NULL DEFAULT '0',
+ `lastip` varchar(45) CHARACTER SET ascii COLLATE ascii_bin NOT NULL,
+ `fixedip` tinyint(1) unsigned NOT NULL DEFAULT '0',
+ `data` blob NOT NULL,
+ PRIMARY KEY (`sid`),
+ KEY `dateline` (`dateline`)
+");
+
// Update path
// #######################
diff --git a/modules-available/rebootcontrol/inc/rebootcontrol.inc.php b/modules-available/rebootcontrol/inc/rebootcontrol.inc.php
index a8018004..da1dd69a 100644
--- a/modules-available/rebootcontrol/inc/rebootcontrol.inc.php
+++ b/modules-available/rebootcontrol/inc/rebootcontrol.inc.php
@@ -494,7 +494,6 @@ class RebootControl
return;
$id = mt_rand();
Session::set('exec-' . $id, $machines, 60);
- Session::save();
Util::redirect('?do=rebootcontrol&show=exec&what=prepare&id=' . $id);
}
diff --git a/modules-available/rebootcontrol/pages/exec.inc.php b/modules-available/rebootcontrol/pages/exec.inc.php
index e5fe3cd8..6b5ea407 100644
--- a/modules-available/rebootcontrol/pages/exec.inc.php
+++ b/modules-available/rebootcontrol/pages/exec.inc.php
@@ -46,7 +46,6 @@ class SubPage
return;
}
Session::set('exec-' . $id, false);
- Session::save();
Render::addTemplate('exec-enter-command', ['clients' => $machines, 'id' => $id]);
}
diff --git a/modules-available/session/hooks/cron.inc.php b/modules-available/session/hooks/cron.inc.php
new file mode 100644
index 00000000..e2cd46e6
--- /dev/null
+++ b/modules-available/session/hooks/cron.inc.php
@@ -0,0 +1,6 @@
+<?php
+
+// Clean up old sessions
+if (mt_rand(1, 10) === 4) {
+ Database::exec("DELETE FROM session WHERE dateline < UNIX_TIMESTAMP()");
+} \ No newline at end of file
diff --git a/modules-available/sysconfig/addmodule_branding.inc.php b/modules-available/sysconfig/addmodule_branding.inc.php
index 22c42f54..e6da9edb 100644
--- a/modules-available/sysconfig/addmodule_branding.inc.php
+++ b/modules-available/sysconfig/addmodule_branding.inc.php
@@ -65,7 +65,6 @@ class Branding_ProcessFile extends AddModule_Base
Util::redirect('?do=SysConfig&action=addmodule&step=Branding_Start');
}
Session::set('logo_tgz', $this->tarFile);
- Session::save();
}
protected function renderInternal()
@@ -227,7 +226,6 @@ class Branding_Finish extends AddModule_Base
Util::redirect('?do=SysConfig&action=addmodule&step=Branding_Start');
Session::set('logo_tgz', false);
Session::set('logo_name', false);
- Session::save();
// Yay
if ($this->edit !== false)
Message::addSuccess('module-edited');
diff --git a/modules-available/sysconfig/addmodule_custommodule.inc.php b/modules-available/sysconfig/addmodule_custommodule.inc.php
index f7ab863e..13794e83 100644
--- a/modules-available/sysconfig/addmodule_custommodule.inc.php
+++ b/modules-available/sysconfig/addmodule_custommodule.inc.php
@@ -83,7 +83,6 @@ class CustomModule_ProcessUpload extends AddModule_Base
'title' => $title,
'userGroupWarn' => $userGroupWarn,
));
- Session::save();
}
}
@@ -135,7 +134,6 @@ class CustomModule_CompressModule extends AddModule_Base
elseif (!$module->generate($this->edit === false, NULL, 200))
Util::redirect('?do=SysConfig&action=addmodule&step=CustomModule_Start');
Session::set('mod_temp', false);
- Session::save();
// Yay
if ($this->edit !== false)
Message::addSuccess('module-edited');
diff --git a/modules-available/sysconfig/addmodule_screensaver.inc.php b/modules-available/sysconfig/addmodule_screensaver.inc.php
index 8e5c5d28..9641bab3 100644
--- a/modules-available/sysconfig/addmodule_screensaver.inc.php
+++ b/modules-available/sysconfig/addmodule_screensaver.inc.php
@@ -47,7 +47,6 @@ class Screensaver_Start extends AddModule_Base
}
$this->session_data['next'] = 'idle-kill';
Session::set('data', $this->session_data);
- Session::save();
}
protected function renderInternal()
@@ -85,7 +84,6 @@ class Screensaver_Text extends AddModule_Base
$next = Request::post('next', $this->session_data['next'], 'string');
$this->session_data['next'] = $next;
Session::set('data', $this->session_data);
- Session::save();
if ($next === 'finish')
diff --git a/modules-available/syslog/page.inc.php b/modules-available/syslog/page.inc.php
index 6868994e..410a1ed7 100644
--- a/modules-available/syslog/page.inc.php
+++ b/modules-available/syslog/page.inc.php
@@ -26,14 +26,19 @@ class Page_SysLog extends Page
Util::redirect('?do=syslog');
}
if (Request::isPost()) {
- $search = Request::any('search');
- $filter = Request::any('filter');
+ $search = Request::any('search', false, 'string');
+ $filter = Request::any('filter', false, 'string');
$not = Request::any('not', false, 'bool');
$machineuuid = Request::any('machineuuid');
- Session::set('log_search', $search);
- Session::set('log_filter', $filter);
- Session::set('log_not', $not);
- Session::save();
+ if (empty($search)) {
+ $search = false;
+ }
+ if (empty($filter)) {
+ $filter = false;
+ }
+ Session::set('log_search', $search, false);
+ Session::set('log_filter', $filter, false);
+ Session::set('log_not', $not, false);
Util::redirect('?do=syslog&' . http_build_query(compact('search', 'filter', 'not', 'machineuuid')));
}
User::assertPermission('*');
diff --git a/modules-available/vmstore/page.inc.php b/modules-available/vmstore/page.inc.php
index 39f6abdc..08d56d96 100644
--- a/modules-available/vmstore/page.inc.php
+++ b/modules-available/vmstore/page.inc.php
@@ -44,7 +44,7 @@ class Page_VmStore extends Page
// Remove rw setting
if ($key === 'cifsopts' || $key === 'nfsopts') {
$vmstore[$key] = preg_replace('/\s+,\s+/', ',', $vmstore[$key]);
- $vmstore[$key] = preg_replace('/^rw,|,rw$/', '', str_replace(',rw,', ',', $vmstore[$key]));
+ $vmstore[$key] = preg_replace('/^rw ,|,rw$/', '', str_replace(',rw,', ',', $vmstore[$key]));
}
}
$storetype = $vmstore['storetype'];
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-06-13 23:25:00 +0200