summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--application/controllers/ResourceController.php10
-rw-r--r--setup/pbs-newdata.sql8
-rw-r--r--setup/pbs.sql6
3 files changed, 11 insertions, 13 deletions
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php
index 9d7af7f..aad9ab8 100644
--- a/application/controllers/ResourceController.php
+++ b/application/controllers/ResourceController.php
@@ -396,7 +396,7 @@ class ResourceController extends Zend_Controller_Action
$tmp_conf = "../resources/config/$hash";
mkdir($tmp_conf ,0777, true);
exec("tar -C $tmp_conf -xf ../resources/bootos/$bootosID/config/default.tgz",$restul);
- exec("tar -C $tmp_conf/rootfs/ -xf ../resources/config/etc.tgz");
+ //exec("tar -C $tmp_conf/rootfs/ -xf ../resources/config/etc.tgz");
$username = '';
$userpassword = '';
@@ -435,10 +435,10 @@ class ResourceController extends Zend_Controller_Action
}
if($loginname != '' && $password != ''){
- if($user->getHometypeID() == 1)
- exec("echo 'if [ -d /media/openslx-stick ] then \n\t if [ ! -d /media/openslx-stick/home/".$loginname." ] then \n\t\t chroot /mnt useradd -d ".$homepath." -m -s /bin/bash -p \"".$password."\" ".$loginname." \n\t else \n\t\t chroot /mnt useradd -d ".$homepath." -s /bin/bash -p \"".$password."\" ".$loginname." \n\t fi \n else \n\t chroot /mnt useradd -d /home/".$loginname." -m -s /bin/bash -p \"".$password."\" ".$loginname." \n fi' >> $tmp_conf/initramfs/postinit.local");
- else
- exec("echo 'chroot /mnt useradd -d ".$homepath." -m -s /bin/bash -p \"".$password."\" ".$loginname."' >> $tmp_conf/initramfs/postinit.local",$restul);
+// if($user->getHometypeID() == 1)
+// //exec("echo 'if [ -d /media/openslx-stick ]; then \n\t if [ ! -d /media/openslx-stick/home/".$loginname." ]; then \n\t\t chroot /mnt useradd -d ".$homepath." -m -s /bin/bash -p '".escapeshellarg("'".$password."'").' ".$loginname." \n\t else \n\t\t chroot /mnt useradd -d ".$homepath." -s '/bin/bash' -p '".$password."' ".$loginname." \n\t fi \n else \n\t chroot /mnt useradd -d /home/".$loginname." -m -s '/bin/bash' -p '".$password."' ".$loginname." \n fi' >> $tmp_conf/initramfs/postinit.local");
+// else
+ exec("echo 'chroot /mnt useradd -d '".escapeshellarg("'".$homepath."'")."' -m -s /bin/bash -p '".escapeshellarg("'".$password."'")."' '".escapeshellarg("'".$loginname."'")."'' >> $tmp_conf/initramfs/postinit.local",$restul);
}
}
diff --git a/setup/pbs-newdata.sql b/setup/pbs-newdata.sql
index 59b9e9e..e209875 100644
--- a/setup/pbs-newdata.sql
+++ b/setup/pbs-newdata.sql
@@ -3,10 +3,10 @@ SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
-- Adding person test2//test
INSERT INTO `pbs_person` (`personID`, `title`, `name`, `firstname`, `street`, `housenumber`, `city`, `postalcode`, `logindate`, `registerdate`, `email`, `login`, `password`, `password_salt`, `loginpassword`) VALUES
-(2, 'Herr', 'Test 2', 'Test 2', 'Teststr,', '5', 'Testburg', '1337', NULL, '1299612370', 'test2', NULL, '4207acba08cadccc397e2302a55b339a', 'f21ee663b17bcefc6868694dffda602a', '$6$v66WvVJA$4wmqSpCv0bMSf8aWtS');
+(2, 'Herr', 'Test 2', 'Test 2', 'Teststr,', '5', 'Testburg', '1337', NULL, '1299612370', 'test2', NULL, '4207acba08cadccc397e2302a55b339a', 'f21ee663b17bcefc6868694dffda602a', '$6$Do9tGnw0$9ndoxsmcpNV.9mFTBRB7u2RbWekbSfjnUfPKXrCUEpXrZXoqnOesXITGl.RDy0cuaYB1Ouob6WtNWQqU/M/4U.');
-- Adding person test3//test
INSERT INTO `pbs_person` (`personID`, `title`, `name`, `firstname`, `street`, `housenumber`, `city`, `postalcode`, `logindate`, `registerdate`, `email`, `login`, `password`, `password_salt`, `loginpassword`) VALUES
-(3, 'Herr', 'Test 3', 'Test 3', 'Teststr,', '5', 'Testburg', '1337', NULL, '1299612370', 'test3', NULL, '4207acba08cadccc397e2302a55b339a', 'f21ee663b17bcefc6868694dffda602a', '$6$v66WvVJA$4wmqSpCv0bMSf8aWtS');
+(3, 'Herr', 'Test 3', 'Test 3', 'Teststr,', '5', 'Testburg', '1337', NULL, '1299612370', 'test3', NULL, '4207acba08cadccc397e2302a55b339a', 'f21ee663b17bcefc6868694dffda602a', '$6$Do9tGnw0$9ndoxsmcpNV.9mFTBRB7u2RbWekbSfjnUfPKXrCUEpXrZXoqnOesXITGl.RDy0cuaYB1Ouob6WtNWQqU/M/4U.');
-- Adding group
INSERT INTO `pbs_group` (`groupID` ,`title` ,`description`)VALUES
@@ -58,9 +58,7 @@ INSERT INTO `pbs_client` (`clientID`, `groupID`,`macadress`, `hardwarehash`) VAL
INSERT INTO `pbs_hometype` (`hometypeID`, `name`) VALUES
(0, 'standard'),
(1, 'usbstick'),
-(2, 'custom path'),
-(3, 'extern'),
-(4, 'dropbox');
+(2, 'custom path');
diff --git a/setup/pbs.sql b/setup/pbs.sql
index 7fea674..d2bdeda 100644
--- a/setup/pbs.sql
+++ b/setup/pbs.sql
@@ -81,7 +81,7 @@ CREATE TABLE IF NOT EXISTS `pbs_person` (
`login` varchar(30) COLLATE utf8_unicode_ci,
`password` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
`password_salt` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
- `loginpassword` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+ `loginpassword` varchar(512) COLLATE utf8_unicode_ci NOT NULL,
`suspend` tinyint(1) NOT NULL,
PRIMARY KEY (`personID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
@@ -172,7 +172,7 @@ ALTER TABLE `pbs_config`
`bootosuserID` int(11) NOT NULL AUTO_INCREMENT,
`configID` int(11) NOT NULL,
`login` varchar(30) NOT NULL,
- `password` varchar(30) NOT NULL,
+ `password` varchar(512) NOT NULL,
`homepath` varchar(140),
`hometypeID` int(11),
PRIMARY KEY (`bootosuserID`),
@@ -656,7 +656,7 @@ INSERT INTO `pbs_rightroles` (`roleID`, `rightID`) VALUES
-- Adding a Person for SuperAdmin
INSERT INTO `pbs_person` (`personID`, `title`, `name`, `firstname`, `street`, `housenumber`, `city`, `postalcode`, `logindate`, `registerdate`, `email`, `login`, `password`, `password_salt`, `loginpassword`) VALUES
-(1, 'Herr', 'Super', 'Admin', 'Street', '1337', 'Teshouse', '1337', NULL, '1299612370', 'test', NULL, '4207acba08cadccc397e2302a55b339a', 'f21ee663b17bcefc6868694dffda602a', '$6$FU8dTKfc$iIkvk3Qj9RxFnQkNDO0GypS//h0vjdi9n.iz/9GmbwMo35/YEA2Y81FIKEcZYQPS8x3MESADNpTn0BxV6csZV.');
+(1, 'Herr', 'Super', 'Admin', 'Street', '1337', 'Teshouse', '1337', NULL, '1299612370', 'test', NULL, '4207acba08cadccc397e2302a55b339a', 'f21ee663b17bcefc6868694dffda602a', '$6$Do9tGnw0$9ndoxsmcpNV.9mFTBRB7u2RbWekbSfjnUfPKXrCUEpXrZXoqnOesXITGl.RDy0cuaYB1Ouob6WtNWQqU/M/4U.');
-- Get him a Membership in MainGroup for activate Requests
INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `roleID`, `personID`, `apikey`) VALUES (NULL, '1', '1', '1', 'apikey1');