fbgui IndexController host was hardcoded..

4 files changed, 169 insertions, 9 deletions

diff --git a/.install.sh.swp b/.install.sh.swp
new file mode 100644
index 0000000..d28071d
--- /dev/null
+++ b/.install.sh.swp
diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php
index 5f09ee0..3bd9794 100644
--- a/application/modules/fbgui/controllers/IndexController.php
+++ b/application/modules/fbgui/controllers/IndexController.php
@@ -182,7 +182,7 @@ class Fbgui_IndexController extends Zend_Controller_Action {
     $sessionMapper->save($session);
 
 
-    $this->view->host = 'pbs2.mp.openslx.org';
+    $this->view->host = $_SERVER['REMOTE_ADDR'];
     $this->view->alphasessionID = $a;
   }
 
diff --git a/setup/pbs-newdata.sql b/setup/pbs-newdata.sql
index e209875..938820c 100644
--- a/setup/pbs-newdata.sql
+++ b/setup/pbs-newdata.sql
@@ -54,14 +54,6 @@ INSERT INTO `pbs_client` (`clientID`, `groupID`,`macadress`, `hardwarehash`) VAL
 (14, 1, '64:46:85:A1:89:23', '9684216842068420616841asd6516984');
 
 
--- Adding hometype
-INSERT INTO `pbs_hometype` (`hometypeID`, `name`) VALUES
-(0, 'standard'),
-(1, 'usbstick'),
-(2, 'custom path');
-
-
-
 -- Adding bootos
 INSERT INTO `pbs_bootos` (`bootosID`, `groupID`, `membershipID`, `title`, `description`, `defaultkcl`, `created`, `expires`, `public`, `source`, `distro`, `distroversion`, `shortname`, `share`) VALUES
 (1,  1, 1, 'BootOs 1', 'Description 1', 'default kcl 1', '1299693782', '2012-03-09', 0, null, null, null, null, null),
diff --git a/setup/pbs-newdata.sql~ b/setup/pbs-newdata.sql~
new file mode 100644
index 0000000..e209875
--- /dev/null
+++ b/setup/pbs-newdata.sql~
@@ -0,0 +1,168 @@
+USE ##pbs##;
+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$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$Do9tGnw0$9ndoxsmcpNV.9mFTBRB7u2RbWekbSfjnUfPKXrCUEpXrZXoqnOesXITGl.RDy0cuaYB1Ouob6WtNWQqU/M/4U.');
+
+-- Adding group
+INSERT INTO `pbs_group` (`groupID` ,`title` ,`description`)VALUES 
+(2, 'Germany', 'Deutschland'), 
+(3, 'France', 'France'),
+(4, 'DFN', 'Deutsches Forschungsnetz'),
+(5, 'Institutionen', 'Fifth Group'),
+(6, 'Baden-Würtemberg', 'Sixth Group'),
+(7, 'Bayern', 'Seventh Group'),
+(8, 'Uni-Freiburg', 'Eight Group');
+
+INSERT INTO `pbs_groupgroups` (`parentID`, `groupID`) VALUES 
+(1, 2),
+(1, 3),
+(2, 4),
+(2, 5),
+(5, 6),
+(5, 7),
+(6, 8);
+
+-- Adding memberships
+INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `roleID`, `personID`, `apikey`) VALUES (NULL, '2', '1', '1', 'apikey2');
+INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `roleID`, `personID`, `apikey`) VALUES (NULL, '3', '1', '1', 'apikey3');
+INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `roleID`, `personID`, `apikey`) VALUES (NULL, '4', '1', '1', 'apikey4');
+INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `roleID`, `personID`, `apikey`) VALUES (NULL, '5', '1', '1', 'apikey4');
+INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `roleID`, `personID`, `apikey`) VALUES (NULL, '6', '1', '1', 'apikey4');
+INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `roleID`, `personID`, `apikey`) VALUES (NULL, '7', '1', '1', 'apikey4');
+INSERT INTO `pbs_membership` (`membershipID`, `groupID`, `roleID`, `personID`, `apikey`) VALUES (NULL, '8', '1', '1', 'apikey4');
+
+-- Adding clients
+INSERT INTO `pbs_client` (`clientID`, `groupID`,`macadress`, `hardwarehash`) VALUES
+(1, 1, 'a5:9a:0f:94:2a:b0', 'ea9b82d9de911bc2d3cd23f53a6cab48'),
+(2, 1, '91:91:f1:e2:99:aa', '1e2b1599710fbbef0dc789e8cfe12455'),
+(3, 1, '6e:5c:82:78:f2:39', '8f6209ca3d6b35e223a11c249d1b69fc'),
+(4, 1, '67:75:e9:f2:5f:8e', 'e17ab09f3586464f19629e2e8b1e9a9d'),
+(5, 1, '63:51:7e:22:aa:72', '9bf70279d283b85440c2031c19bb6812'),
+(6, 1, '68:9e:fe:47:95:c5', 'ad3bce4464a6267441ec144744439c7e'),
+(7, 1, '6e:1c:2e:01:77:33', 'e8d7e80d79f224771b7a3a0af4e02748'),
+(8, 1, 'd1:91:20:43:2f:dd', 'ded66ce272f384e9e386c1b57ded3e4d'),
+(9, 1, '1b:0f:a5:82:47:16', '695610ee509c060b1fca9c8011529af4'),
+(10, 1, '56:8e:7b:03:5f:98', 'a3562c8cad2a4fa4fc11656025dc911b'),
+(11, 2, 'af:54:07:87:63:44', '98413218152196816519841365419816'),
+(12, 2, '87:21:74:52:96:20', '98741298132516132169813516981616'),
+(13, 2, '14:47:58:47:36:48', '32168132068132068513216053516513'),
+(14, 1, '64:46:85:A1:89:23', '9684216842068420616841asd6516984');
+
+
+-- Adding hometype
+INSERT INTO `pbs_hometype` (`hometypeID`, `name`) VALUES
+(0, 'standard'),
+(1, 'usbstick'),
+(2, 'custom path');
+
+
+
+-- Adding bootos
+INSERT INTO `pbs_bootos` (`bootosID`, `groupID`, `membershipID`, `title`, `description`, `defaultkcl`, `created`, `expires`, `public`, `source`, `distro`, `distroversion`, `shortname`, `share`) VALUES
+(1,  1, 1, 'BootOs 1', 'Description 1', 'default kcl 1', '1299693782', '2012-03-09', 0, null, null, null, null, null),
+(2,  1, 1, 'BootOs 2', 'Description 2', 'default kcl 2', '1299693782', '2012-03-09', 0, null, null, null, null, null),
+(3,  1, 1, 'BootOs 3', 'Description 3', 'default kcl 3', '1299693782', '2012-03-09', 0, null, null, null, null, null),
+(4,  1, 1, 'BootOs 4', 'Description 4', 'default kcl 4', '1299693782', '2012-03-09', 0, null, null, null, null, null),
+(5,  1, 1, 'BootOs 5', 'Description 5', 'default kcl 5', '1299693782', '2012-03-09', 0, null, null, null, null, null),
+(6,  1, 1, 'BootOs 6', 'Description 6', 'default kcl 6', '1299693782', '2012-03-09', 0, null, null, null, null, null),
+(7,  1, 1, 'BootOs 7', 'Description 7', 'default kcl 7', '1299693782', '2012-03-09', 0, null, null, null, null, null),
+(8,  1, 1, 'BootOs 8', 'Description 8', 'default kcl 8', '1299693782', '2012-03-09', 0, null, null, null, null, null),
+(9,  1, 1, 'BootOs 9', 'Description 9', 'default kcl 9', '1299693782', '2012-03-09', 0, null, null, null, null, null),
+(10, 1, 1, 'BootOs 10', 'Description 10', 'default kcl 10', '1299693782', '2012-03-09', 0, null, null, null, null, null);
+
+
+-- Adding config
+INSERT INTO `pbs_config` (`configID`, `title`, `description`, `groupID`, `membershipID`, `visible`, `created`, `bootosID`) VALUES
+(1, 'Default Config', 'Desc1', 1, null, '1', '1299693677', '1'),
+(2, 'Config 2', 'Desc2' ,null, 1, '1', '1299693690', '1');
+
+
+
+-- Adding bootosuser
+INSERT INTO `pbs_bootosuser` (`bootosuserID`, `configID`, `login`, `password`, `homepath`, `hometypeID`) VALUES
+(1, 1, 'login1', 'password1', null, 0),
+(2, 1, 'login2', 'password2', null, 1),
+(3, 1, 'login3', 'password3', '/home/bla/blub', 2),
+(4, 2, 'login4', 'password4', null, 0),
+(5, 2, 'login5', 'password5', null, 1);
+
+-- Adding preboot
+INSERT INTO `pbs_preboot` (`prebootID`, `title`, `membershipID`, `groupID`, `created`, `source`, `description`) VALUES
+(1, 'Preboot 1', 1, 1,  '1299694422', 'source1', 'Description 1'),
+(2, 'Preboot 2', 1, 1,  '1299694422', 'source1', 'Description 2'),
+(3, 'Preboot 3', 1, 1,  '1299694422', 'source1', 'Description 3');
+
+-- Adding bootiso
+INSERT INTO `pbs_bootiso` (`bootisoID`, `title`, `membershipID`, `groupID`, `prebootID`, `serialnumber`, `created`, `expires`, `public`, `description`) VALUES
+(1, 'BootMedium 1', 1, 1, '1', '10-20-30-40-50', '123', '2012-03-09', 0, 'Description 1'),
+(2, 'BootMedium 2', 1, 1, '2', '11-20-30-40-50', '456', '2012-03-09', 0, 'Description 2'),
+(3, 'BootMedium 3', 1, 1, '3', '12-20-30-40-50', '789', '2012-03-09', 0, 'Description 3');
+
+-- Adding Pools
+INSERT INTO `pbs_pool` (`poolID`, `groupID`, `title`, `description`, `location`) VALUES
+(1, 1, 'Pool 1', 'Description 1', 'Keller'),
+(2, 1, 'Pool 2', 'Description 2', 'EG'),
+(3, 1, 'Pool 3', 'Description 3', '1 OG'),
+(4, 1, 'Pool 4', 'Description 4', '2 OG');
+
+-- Adding Bootmenus
+INSERT INTO `pbs_bootmenu` (`bootmenuID`, `membershipID`, `groupID`, `title`, `created`,`defaultbootmenu`) VALUES
+(1, NULL, 1, 'Bootmenu 1', '1299694422', '0'),
+(2, NULL, 1, 'Bootmenu 2', '1299694433', '0'),
+(3, NULL, 1, 'Bootmenu 3', '1299694441', '0'),
+(4, NULL, 1, 'Bootmenu 4', '1299694454', '1'),
+(5, NULL, 1, 'Bootmenu 5', '1299694461', '0');
+
+-- Adding BootOs to BootMenus
+INSERT INTO `pbs_bootmenuentries` (`bootmenuentriesID`, `bootosID`, `bootmenuID`, `title`, `kcl`, `kclappend`, `configID`, `order`) VALUES
+(1, 5, 1, '123', '1', 'abc', 1, 0),
+(2, 2, 1, 'menu2', '0', '123456', 1, 1),
+(3, 6, 1, 'Mein OS 6', '1', 'appending', 1, 2),
+(4, 10, 2, 'Das OS 10', '1', 'append', 1, 0),
+(5, 9, 5, 'Bootos 9', '1', 'a', 1, 0),
+(6, 1, 4, 'booting 1', '0', 'aphabeta', 1, 0),
+(7, 6, 3, 'blablabla', '0', '11', 1, 0);
+
+-- Adding client to pools (poolentries)
+INSERT INTO `pbs_poolentries` (`poolentriesID`, `poolID`, `clientID`) VALUES
+(1, 1, 1),
+(2, 1, 2),
+(3, 1, 3),
+(4, 1, 4),
+(5, 2, 5),
+(6, 2, 6),
+(7, 3, 7),
+(8, 3, 8),
+(9, 4, 9),
+(10, 4, 10);
+
+-- Adding Sessions
+INSERT INTO `pbs_session` (`sessionID`, `alphasessionID`,`clientID`, `bootmenuentryID`,`bootosID`, `bootisoID`, `time`, `ip`, `ip6`) VALUES
+(1, 'a', 1, NULL, NULL, 1, '1299684000', '132.230.5.6', ''),
+(2, 'b', 9, NULL, NULL, 2, '1299684000', '132.230.10.2', ''),
+(3, 'c', 10, NULL, NULL, 1, '1299648000', '132.20.20.2', ''),
+(4, 'd', 7, NULL, NULL, 3, '1299676800', '84.23.56.86', ''),
+(5, 'e', 4, NULL, NULL, 3, '1299674340', '70.81.94.222', ''),
+(6, 'f', 5, NULL, NULL, 3, '1299683100', '210.84.65.2', '');
+
+-- Adding Filter
+INSERT INTO `pbs_filter` (`filterID`, `membershipID`, `groupID`, `bootmenuID`, `title`, `description`, `created`, `priority`) VALUES
+(1, NULL, 1, 1, 'Filter 1', 'Innerhalb der Uni', '1300022113', 1),
+(2, NULL, 1, 2, 'Filter 2', 'Ausserhalb der Uni', '1302000113', 1),
+(3, NULL, 1, 3, 'Filter 3', 'Montags-Freitag \r\nvon 8 bis 16 Uhr \r\nInnerhalb der Uni', '1302022113', 10);
+
+-- Adding Filterentries
+INSERT INTO `pbs_filterentries` (`filterentriesID`, `filterID`, `filtertypeID`, `filtervalue`, `filtervalue2`) VALUES
+(1, 1, 6, '1', NULL),
+(2, 1, 1, '132.230.001.001', '132.230.255.255'),
+(3, 2, 6, '1', NULL),
+(4, 2, 1, '000.000.000.000', '132.229.255.255'),
+(5, 2, 1, '132.231.001.001', '255.255.255.255'),
+(6, 3, 6, '1', NULL),
+(7, 3, 7, '08:00', '16:00'),
+(8, 3, 10, '1', '5');