summaryrefslogtreecommitdiffstats
path: root/application/controllers
diff options
context:
space:
mode:
authormichael pereira2011-04-21 14:03:59 +0200
committermichael pereira2011-04-21 14:03:59 +0200
commitdaf6e795d126ec49e25e8b40931470e3c63666a9 (patch)
tree3368e0e2c463bfa9d77478dce2dc142ae7428836 /application/controllers
parentupdates raus (diff)
parentUserpasswort verschlüsselung (diff)
downloadpbs2-daf6e795d126ec49e25e8b40931470e3c63666a9.tar.gz
pbs2-daf6e795d126ec49e25e8b40931470e3c63666a9.tar.xz
pbs2-daf6e795d126ec49e25e8b40931470e3c63666a9.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/controllers')
-rw-r--r--application/controllers/ResourceController.php19
1 files changed, 10 insertions, 9 deletions
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php
index 5790dbd..3547818 100644
--- a/application/controllers/ResourceController.php
+++ b/application/controllers/ResourceController.php
@@ -35,7 +35,7 @@ class ResourceController extends Zend_Controller_Action
$this->membership = new Application_Model_Membership();
$this->rightrolesMapper = new Application_Model_RightRolesMapper();
- @list($this->membership) = $membershipMapper->findBy(array('apikey' => $apikey));
+ list($this->membership) = $membershipMapper->findBy(array('apikey' => $apikey));
if($this->membership == null){
header('HTTP/1.0 401 Member not found');
die();
@@ -85,7 +85,7 @@ class ResourceController extends Zend_Controller_Action
public function addbootosAction()
{
- @list($rightroles) = $this->rightrolesMapper->findBy(array('rightID' => '55', 'roleID' => $this->membership->getRoleID()));
+ list($rightroles) = $this->rightrolesMapper->findBy(array('rightID' => '55', 'roleID' => $this->membership->getRoleID()));
if($rightroles == null){
header('HTTP/1.0 403 No Right to Create Bootos');
die();
@@ -113,7 +113,7 @@ class ResourceController extends Zend_Controller_Action
$bootosMapper = new Application_Model_BootOsMapper();
$groupID = $this->membership->getGroupID();
- @list($bootos) = $bootosMapper->findBy(array('groupid' => $groupID, 'title' => $params['title'], 'distro' => $params['distro'], 'distroversion' => $params['distroversion'], 'source' => $source, 'share' => $params['share']));
+ list($bootos) = $bootosMapper->findBy(array('groupid' => $groupID, 'title' => $params['title'], 'distro' => $params['distro'], 'distroversion' => $params['distroversion'], 'source' => $source, 'share' => $params['share']));
if($bootos != null){
header('HTTP/1.0 400 Bootos already exists');
die();
@@ -152,7 +152,7 @@ class ResourceController extends Zend_Controller_Action
public function editbootosAction()
{
- @list($rightroles) = $this->rightrolesMapper->findBy(array('rightID' => '58', 'roleID' => $this->membership->getRoleID()));
+ list($rightroles) = $this->rightrolesMapper->findBy(array('rightID' => '58', 'roleID' => $this->membership->getRoleID()));
if($rightroles == null){
header('HTTP/1.0 403 No Right to Edit Bootos');
die();
@@ -176,7 +176,7 @@ class ResourceController extends Zend_Controller_Action
$bootosMapper = new Application_Model_BootOsMapper();
$groupID = $this->membership->getGroupID();
- @list($bootos) = $bootosMapper->findBy(array('groupid' => $groupID, 'title' => $params['title'], 'distro' => $params['distro'], 'distroversion' => $params['distroversion'], 'source' => $source, 'share' => $params['share']));
+ list($bootos) = $bootosMapper->findBy(array('groupid' => $groupID, 'title' => $params['title'], 'distro' => $params['distro'], 'distroversion' => $params['distroversion'], 'source' => $source, 'share' => $params['share']));
if($bootos == null){
header('HTTP/1.0 400 Bootos not found');
@@ -218,7 +218,7 @@ class ResourceController extends Zend_Controller_Action
public function addprebootAction()
{
- @list($rightroles) = $this->rightrolesMapper->findBy(array('rightID' => '40', 'roleID' => $this->membership->getRoleID()));
+ list($rightroles) = $this->rightrolesMapper->findBy(array('rightID' => '40', 'roleID' => $this->membership->getRoleID()));
if($rightroles == null){
header('HTTP/1.0 403 No Right to Create Preboots');
die();
@@ -247,7 +247,7 @@ class ResourceController extends Zend_Controller_Action
$prebootMapper = new Application_Model_PreBootMapper();
$groupID = $this->membership->getGroupID();
- @list($preboot) = $prebootMapper->findBy(array('groupid' => $groupID, 'title' => $params['title']));
+ list($preboot) = $prebootMapper->findBy(array('groupid' => $groupID, 'title' => $params['title']));
if($preboot != null){
header('HTTP/1.0 400 Preboot already exists');
die();
@@ -277,7 +277,7 @@ class ResourceController extends Zend_Controller_Action
public function editprebootAction()
{
- @list($rightroles) = $this->rightrolesMapper->findBy(array('rightID' => '41', 'roleID' => $this->membership->getRoleID()));
+ list($rightroles) = $this->rightrolesMapper->findBy(array('rightID' => '41', 'roleID' => $this->membership->getRoleID()));
if($rightroles == null){
header('HTTP/1.0 403 No Right to Edit Preboot');
die();
@@ -306,7 +306,7 @@ class ResourceController extends Zend_Controller_Action
$groupID = $this->membership->getGroupID();
$preboot = new Application_Model_PreBoot();
- @list($preboot) = $prebootMapper->findBy(array('groupid' => $groupID, 'title' => $params['title']));
+ list($preboot) = $prebootMapper->findBy(array('groupid' => $groupID, 'title' => $params['title']));
if($preboot == null){
header('HTTP/1.0 400 Preboot not found');
@@ -397,6 +397,7 @@ class ResourceController extends Zend_Controller_Action
exec("tar -C $path_userconf -xvf ../resources/config/$configID/default.tgz");
exec("echo '$loginname:x:1000:1000:".$person->getName()." ".$person->getFirstname().",,,:/home/$loginname:/bin/bash' >> $path_userconf/rootfs/etc/passwd");
exec("md5pass ".$person->getPassword(), $pwhash);
+ // crypt(password, '$6$'.randomString(8).'$')
exec("echo '$loginname:$pwhash[0]:0:0:99999:7:::' >> $path_userconf/rootfs/etc/shadow");
exec("echo 'mkdir /home/$loginname' >> $path_userconf/initramfs/postinit.local");
}