summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon2011-03-08 12:21:28 +0100
committerSimon2011-03-08 12:21:28 +0100
commit8ffb3fe22d10ebbe174e50cad63d9aa2a0130065 (patch)
treeb407fe55356b88fee81db806d4faee85ac92c2f1
parentBootMenu fix (diff)
downloadpbs2-8ffb3fe22d10ebbe174e50cad63d9aa2a0130065.tar.gz
pbs2-8ffb3fe22d10ebbe174e50cad63d9aa2a0130065.tar.xz
pbs2-8ffb3fe22d10ebbe174e50cad63d9aa2a0130065.zip
bootisoID in session eingefügt
-rw-r--r--application/configs/application.ini2
-rw-r--r--application/controllers/FilterController.php6
-rw-r--r--pbs.sql2
3 files changed, 6 insertions, 4 deletions
diff --git a/application/configs/application.ini b/application/configs/application.ini
index c02bd7c..226dc30 100644
--- a/application/configs/application.ini
+++ b/application/configs/application.ini
@@ -10,7 +10,7 @@ resources.frontController.params.displayExceptions = 0
resources.db.adapter = PDO_MYSQL
resources.db.params.host = localhost
resources.db.params.username = root
-resources.db.params.password = lsfks
+resources.db.params.password = 123456
resources.db.params.dbname = pbs
resources.db.isDefaultTableAdapter = true
resources.view[] = ""
diff --git a/application/controllers/FilterController.php b/application/controllers/FilterController.php
index 73b087c..3f9a49d 100644
--- a/application/controllers/FilterController.php
+++ b/application/controllers/FilterController.php
@@ -310,19 +310,19 @@ class FilterController extends Zend_Controller_Action
If client is a specific client
*/
#########################################################
- // BootIso
+ // BootIsoID
$filtertypID = 4;
/*
WHERE bootiso = bootiso
*/
#########################################################
- // Membership
+ // MembershipID
$filtertypID = 5;
/*
user is in a defined membership
*/
#########################################################
- // Group
+ // GroupID
$filtertypID = 6;
/*
user is in a defined groupID
diff --git a/pbs.sql b/pbs.sql
index ef72c39..099ea65 100644
--- a/pbs.sql
+++ b/pbs.sql
@@ -214,10 +214,12 @@ CREATE TABLE IF NOT EXISTS `pbs_session` (
KEY `clientID` (`clientID`),
KEY `bootosID` (`bootosID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
+ALTER TABLE `pbs_session` ADD `bootisoID` INT NOT NULL AFTER `bootosID`
ALTER TABLE `pbs_session`
ADD CONSTRAINT `pbs_session_ibfk_1` FOREIGN KEY (`clientID`) REFERENCES `pbs_client` (`clientID`),
ADD CONSTRAINT `pbs_session_ibfk_2` FOREIGN KEY (`bootosID`) REFERENCES `pbs_bootos` (`bootosID`);
+ ADD CONSTRAINT `pbs_session_ibfk_3` FOREIGN KEY (`bootisoID`) REFERENCES `pbs_bootiso` (`bootisoID`);
CREATE TABLE IF NOT EXISTS `pbs_pool` (
`poolID` int(11) NOT NULL AUTO_INCREMENT,