From 198221618856ef22ab8f69874b8d4e101db3746d Mon Sep 17 00:00:00 2001
From: michael pereira
Date: Tue, 5 Apr 2011 15:35:32 +0200
Subject: Rechte in Controller eingepflanzt

---
 pbs.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pbs.sql')

diff --git a/pbs.sql b/pbs.sql
index bd4985d..f8a7ee5 100644
--- a/pbs.sql
+++ b/pbs.sql
@@ -117,7 +117,7 @@ ALTER TABLE `pbs_membership`
 CREATE TABLE IF NOT EXISTS `pbs_config` (
   `configID` int(11) NOT NULL AUTO_INCREMENT,
   `title` varchar(30) NOT NULL,
-  `groupID` int(11) NOT NULL,
+  `groupID` int(11),
   `membershipID` int(11),
   `shellscript` text NOT NULL,
   `created` VARCHAR(14) NOT NULL,
@@ -158,7 +158,7 @@ ALTER TABLE `pbs_bootos`
 CREATE TABLE IF NOT EXISTS `pbs_bootmenu` (
   `bootmenuID` int(11) NOT NULL AUTO_INCREMENT,
   `membershipID` int(11),
-  `groupID` int(11) NOT NULL,
+  `groupID` int(11),
   `title` varchar(30) NOT NULL,
   `created` varchar(14) NOT NULL,
   PRIMARY KEY (`bootmenuID`),
-- 
cgit v1.2.3-55-g7522


From 3def9f74091e1b8616ad2e1870574705e73fc1b1 Mon Sep 17 00:00:00 2001
From: Simon
Date: Tue, 5 Apr 2011 16:27:13 +0200
Subject: Suche gefixt & Neues Recht für Session

---
 application/modules/user/controllers/BootisoController.php  |  2 +-
 application/modules/user/controllers/BootmenuController.php |  2 +-
 application/modules/user/controllers/BootosController.php   |  2 +-
 application/modules/user/controllers/ClientController.php   |  2 +-
 application/modules/user/controllers/ConfigController.php   |  2 +-
 application/modules/user/controllers/FilterController.php   |  2 +-
 application/modules/user/controllers/PoolController.php     |  2 +-
 application/modules/user/controllers/SessionController.php  | 12 +++++++++++-
 library/Pbs/Search.php                                      |  2 +-
 pbs.sql                                                     |  7 ++++++-
 public/media/css/style.css                                  |  5 +++++
 11 files changed, 30 insertions(+), 10 deletions(-)

(limited to 'pbs.sql')

diff --git a/application/modules/user/controllers/BootisoController.php b/application/modules/user/controllers/BootisoController.php
index 5c3acaa..654e7eb 100644
--- a/application/modules/user/controllers/BootisoController.php
+++ b/application/modules/user/controllers/BootisoController.php
@@ -84,11 +84,11 @@ class user_BootisoController extends Zend_Controller_Action
 		$mySearch = new Pbs_Search();
 		$mySearch->setSearchTerm($search);
 		$mySearch->setModule('bootiso');
-		$this->view->searchform = $mySearch->searchForm();
 		if($search != ''){
 			$this->view->search = $mySearch->getSearchTerm();			
 			$this->view->bootisolist = $mySearch->search($this->view->bootisolist);			
 		}
+		$this->view->searchform = $mySearch->searchForm();
     	
 	    // Pagination
     	$pagination = new Pbs_Pagination();	
diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php
index 84c31ff..cb7810b 100644
--- a/application/modules/user/controllers/BootmenuController.php
+++ b/application/modules/user/controllers/BootmenuController.php
@@ -92,11 +92,11 @@ class user_BootmenuController extends Zend_Controller_Action
 		$mySearch = new Pbs_Search();
 		$mySearch->setSearchTerm($search);
 		$mySearch->setModule('bootmenu');
-		$this->view->searchform = $mySearch->searchForm();
 		if($search != ''){
 			$this->view->search = $mySearch->getSearchTerm();			
 			$bootmenu = $mySearch->search($bootmenu);			
 		}
+		$this->view->searchform = $mySearch->searchForm();
 	    
 	    // Pagination
 	    $pagination = new Pbs_Pagination();	
diff --git a/application/modules/user/controllers/BootosController.php b/application/modules/user/controllers/BootosController.php
index eeb60a7..12e2d68 100644
--- a/application/modules/user/controllers/BootosController.php
+++ b/application/modules/user/controllers/BootosController.php
@@ -71,11 +71,11 @@ class user_BootosController extends Zend_Controller_Action
 		$mySearch = new Pbs_Search();
 		$mySearch->setSearchTerm($search);
 		$mySearch->setModule('bootos');
-		$this->view->searchform = $mySearch->searchForm();
 		if($search != ''){
 			$this->view->search = $mySearch->getSearchTerm();			
 			$this->view->bootoslist = $mySearch->search($this->view->bootoslist);			
 		}
+		$this->view->searchform = $mySearch->searchForm();
     	
     	// Pagination
 	    $pagination = new Pbs_Pagination();	
diff --git a/application/modules/user/controllers/ClientController.php b/application/modules/user/controllers/ClientController.php
index 9fe4b03..73c5279 100644
--- a/application/modules/user/controllers/ClientController.php
+++ b/application/modules/user/controllers/ClientController.php
@@ -54,11 +54,11 @@ class User_ClientController extends Zend_Controller_Action
 		$mySearch = new Pbs_Search();
 		$mySearch->setSearchTerm($search);
 		$mySearch->setModule('client');
-		$this->view->searchform = $mySearch->searchForm();
 		if($search != ''){
 			$this->view->search = $mySearch->getSearchTerm();			
 			$clientsInGroup = $mySearch->search($clientsInGroup);			
 		}
+		$this->view->searchform = $mySearch->searchForm();
 		
 		// Pagination
 		$pagination = new Pbs_Pagination();	
diff --git a/application/modules/user/controllers/ConfigController.php b/application/modules/user/controllers/ConfigController.php
index ecc3c65..498e890 100644
--- a/application/modules/user/controllers/ConfigController.php
+++ b/application/modules/user/controllers/ConfigController.php
@@ -70,11 +70,11 @@ class user_ConfigController extends Zend_Controller_Action
 		$mySearch = new Pbs_Search();
 		$mySearch->setSearchTerm($search);
 		$mySearch->setModule('config');
-		$this->view->searchform = $mySearch->searchForm();
 		if($search != ''){
 			$this->view->search = $mySearch->getSearchTerm();			
 			$this->view->configlist = $mySearch->search($this->view->configlist);			
 		}
+		$this->view->searchform = $mySearch->searchForm();
     	
     	// Pagination
 	    $pagination = new Pbs_Pagination();	
diff --git a/application/modules/user/controllers/FilterController.php b/application/modules/user/controllers/FilterController.php
index f84f501..e9850a9 100644
--- a/application/modules/user/controllers/FilterController.php
+++ b/application/modules/user/controllers/FilterController.php
@@ -61,11 +61,11 @@ class User_FilterController extends Zend_Controller_Action
 		$mySearch = new Pbs_Search();
 		$mySearch->setSearchTerm($search);
 		$mySearch->setModule('filter');
-		$this->view->searchform = $mySearch->searchForm();
 		if($search != ''){
 			$this->view->search = $mySearch->getSearchTerm();			
 			$allFilter = $mySearch->search($allFilter);			
 		}
+		$this->view->searchform = $mySearch->searchForm();
 		
 		// Pagination
 	    $pagination = new Pbs_Pagination();	
diff --git a/application/modules/user/controllers/PoolController.php b/application/modules/user/controllers/PoolController.php
index 7800c7a..87f330a 100644
--- a/application/modules/user/controllers/PoolController.php
+++ b/application/modules/user/controllers/PoolController.php
@@ -70,11 +70,11 @@ class User_PoolController extends Zend_Controller_Action
 		$mySearch = new Pbs_Search();
 		$mySearch->setSearchTerm($search);
 		$mySearch->setModule('pool');
-		$this->view->searchform = $mySearch->searchForm();
 		if($search != ''){
 			$this->view->search = $mySearch->getSearchTerm();			
 			$yourpools = $mySearch->search($yourpools);			
 		}
+		$this->view->searchform = $mySearch->searchForm();
 		
 		// Pagination
 	    $pagination = new Pbs_Pagination();	
diff --git a/application/modules/user/controllers/SessionController.php b/application/modules/user/controllers/SessionController.php
index 3c3c192..b027f63 100644
--- a/application/modules/user/controllers/SessionController.php
+++ b/application/modules/user/controllers/SessionController.php
@@ -23,6 +23,9 @@ class User_SessionController extends Zend_Controller_Action
 
     public function indexAction()
     {
+    	if(!Pbs_Acl::checkRight('so'))
+    		$this->_redirect('/user/index');
+    		
 		$sessionMapper = new Application_Model_SessionMapper();
 		$bootisoMapper = new Application_Model_BootIsoMapper();
 		$bootosMapper = new Application_Model_BootOsMapper();
@@ -54,17 +57,22 @@ class User_SessionController extends Zend_Controller_Action
 				$mySessions[] =$session;
 			}			
 		}
+		// Sort after date/id
+		usort($mySessions, function($func_a, $func_b) {
+			if($func_a->getID() == $func_b->getID()) return 0;
+			return ($func_a->getID() < $func_b->getID()) ? -1 : 1;
+		  });
 		
 		// Search
 		$search = $this->_request->getParam('search');
 		$mySearch = new Pbs_Search();
 		$mySearch->setSearchTerm($search);
 		$mySearch->setModule('session');
-		$this->view->searchform = $mySearch->searchForm();
 		if($search != ''){
 			$this->view->search = $mySearch->getSearchTerm();			
 			$mySessions = $mySearch->search($mySessions);			
 		}
+		$this->view->searchform = $mySearch->searchForm();
     	
     	// Pagination
 	    $pagination = new Pbs_Pagination();	
@@ -79,6 +87,8 @@ class User_SessionController extends Zend_Controller_Action
 		$this->view->sessions = $mySessions;   		
 		
     }
+
+
     
     public function searchAction(){
 		$this->_redirect('/user/session/index/search/'.($_GET['search']));
diff --git a/library/Pbs/Search.php b/library/Pbs/Search.php
index eb9d198..611c5e2 100644
--- a/library/Pbs/Search.php
+++ b/library/Pbs/Search.php
@@ -16,7 +16,7 @@ class Pbs_Search{
 		$highlight = array();
 		if($this->searchTerm != ''){
 			$str .= "<a href='/user/".$this->module."/'><img src='/media/img/delete.png' alt='Delete Client'/></a>";
-			$str .= "<div>$this->countresult results found in $this->countall</div>";
+			$str .= "<div class='searchresult'>$this->countresult result".(($this->countresult==1)?'':'s')." found</div>";
 			$str .="<script type='text/javascript' src='/media/js/jquery.highlight-3.js'></script>";				
 			foreach($this->getSearchTerms() as $term){
 				$highlight[] = "$('table').highlight('".$term."');";
diff --git a/pbs.sql b/pbs.sql
index 7f2bd52..dd81ea3 100644
--- a/pbs.sql
+++ b/pbs.sql
@@ -357,6 +357,7 @@ INSERT INTO `pbs_rightcategory` (`rightcategoryID`, `title`) VALUES
 (9, 'Client'),
 (10, 'Pool'),
 (11, 'Filter');
+(12, 'Session');
 
 -- Insert rights
 INSERT INTO `pbs`.`pbs_right` (`rightID`, `rightcategoryID`, `shortcut`, `title`, `description`) VALUES 
@@ -551,9 +552,13 @@ INSERT INTO `pbs`.`pbs_right` (`rightID`, `rightcategoryID`, `shortcut`, `title`
 	-- FilterEinträge löschen
 (NULL, '11', 'ffd', 'Delete Filterentry of a Filter', NULL);
 
+	-- Session
+	-- Session Übersicht ansehen
+(NULL, '12', 'so', 'Show overview of Session', NULL),
+
 -- Adding Super-User
 INSERT INTO `pbs`.`pbs_group` (`groupID` ,`title` ,`description`)VALUES 
 (1, 'OpenSLX', 'This is the OpenSLX-Group');
 INSERT INTO `pbs`.`pbs_role` (`roleID`, `groupID`, `title`, `description`, `inheritance`) VALUES (1, '1', 'SuperAdmin', 'The SuperAdmin', 0);
 INSERT INTO `pbs`.`pbs_rightroles` (`roleID`, `rightID`) VALUES
-(1, 1),(1, 2),(1, 3),(1, 4),(1, 5),(1, 6),(1, 7),(1, 8),(1, 9),(1, 10),(1, 11),(1, 12),(1, 13),(1, 14),(1, 15),(1, 16),(1, 17),(1, 18),(1, 19),(1, 20),(1, 21),(1, 22),(1, 23),(1, 24),(1, 25),(1, 26),(1, 27),(1, 28),(1, 29),(1, 30),(1, 31),(1, 32),(1, 33),(1, 34),(1, 35),(1, 36),(1, 37),(1, 38),(1, 39),(1, 40),(1, 41),(1, 42),(1, 43),(1, 44),(1, 45),(1, 46),(1, 47),(1, 48),(1, 49),(1, 50),(1, 51),(1, 52),(1, 53),(1, 54),(1, 55),(1, 56),(1, 57),(1, 58),(1, 59),(1, 60),(1, 61),(1, 62),(1, 63),(1, 64),(1, 65),(1, 66),(1, 67),(1, 68),(1, 69),(1, 70),(1, 71),(1, 72),(1, 73),(1, 74),(1, 75),(1, 76),(1, 77),(1, 78),(1, 79),(1, 80),(1, 81),(1, 82),(1, 83),(1, 84);
+(1, 1),(1, 2),(1, 3),(1, 4),(1, 5),(1, 6),(1, 7),(1, 8),(1, 9),(1, 10),(1, 11),(1, 12),(1, 13),(1, 14),(1, 15),(1, 16),(1, 17),(1, 18),(1, 19),(1, 20),(1, 21),(1, 22),(1, 23),(1, 24),(1, 25),(1, 26),(1, 27),(1, 28),(1, 29),(1, 30),(1, 31),(1, 32),(1, 33),(1, 34),(1, 35),(1, 36),(1, 37),(1, 38),(1, 39),(1, 40),(1, 41),(1, 42),(1, 43),(1, 44),(1, 45),(1, 46),(1, 47),(1, 48),(1, 49),(1, 50),(1, 51),(1, 52),(1, 53),(1, 54),(1, 55),(1, 56),(1, 57),(1, 58),(1, 59),(1, 60),(1, 61),(1, 62),(1, 63),(1, 64),(1, 65),(1, 66),(1, 67),(1, 68),(1, 69),(1, 70),(1, 71),(1, 72),(1, 73),(1, 74),(1, 75),(1, 76),(1, 77),(1, 78),(1, 79),(1, 80),(1, 81),(1, 82),(1, 83),(1, 84),(1, 85);
diff --git a/public/media/css/style.css b/public/media/css/style.css
index 2057c54..0686eae 100644
--- a/public/media/css/style.css
+++ b/public/media/css/style.css
@@ -307,6 +307,11 @@ td {
 	border: 1px solid #CCC;
 }
 
+div.searchresult {
+	margin-left:10px;
+	font-size:10px;
+}
+
 .updatebutton,.addbutton {
 	float: right;
 }
-- 
cgit v1.2.3-55-g7522


From e13feb35a7e488e9d88282a57308bf2314fc2457 Mon Sep 17 00:00:00 2001
From: Simon
Date: Tue, 5 Apr 2011 16:52:17 +0200
Subject: Neue Rechte für Übersicht von Rollen, Layout an Rechte angepasst

---
 .../modules/user/controllers/SessionController.php |  4 +--
 application/modules/user/layouts/user.phtml        | 40 ++++++++++++++--------
 pbs.sql                                            |  2 ++
 3 files changed, 29 insertions(+), 17 deletions(-)

(limited to 'pbs.sql')

diff --git a/application/modules/user/controllers/SessionController.php b/application/modules/user/controllers/SessionController.php
index b027f63..d149f22 100644
--- a/application/modules/user/controllers/SessionController.php
+++ b/application/modules/user/controllers/SessionController.php
@@ -76,7 +76,7 @@ class User_SessionController extends Zend_Controller_Action
     	
     	// Pagination
 	    $pagination = new Pbs_Pagination();	
-		$pagination->setPerPage(3);		
+		$pagination->setPerPage(10);		
 		$pagination->setElement($mySessions);
 		$pagination->setRequestPage($this->_request->getParam('page'));		
 		$pagination->setPageUrl('/user/session/index'.((isset($this->view->search))?'/search/'.$this->view->search:''));
@@ -87,8 +87,6 @@ class User_SessionController extends Zend_Controller_Action
 		$this->view->sessions = $mySessions;   		
 		
     }
-
-
     
     public function searchAction(){
 		$this->_redirect('/user/session/index/search/'.($_GET['search']));
diff --git a/application/modules/user/layouts/user.phtml b/application/modules/user/layouts/user.phtml
index 14ce235..7d80d38 100644
--- a/application/modules/user/layouts/user.phtml
+++ b/application/modules/user/layouts/user.phtml
@@ -28,20 +28,32 @@ echo $this->headScript()."\n";
 	<li class='navTreeItem'><a href='/user/'>user</a></li>
 	<li>
 	<ul class='navTreeLevel1'>
-		<?php if (Zend_Auth::getInstance()->hasIdentity() && count(Zend_Session::namespaceGet('userIDs')) > 0) {?>
-		<li class='navTreeItem'><a href='/user/person'>Person</a></li>
-		<li class='navTreeItem'><a href='/user/group'>Group</a></li>
-		<li class='navTreeItem'><a href='/user/role'>Role</a></li>
-		<li class='navTreeItem'><a href='/user/bootiso'>BootIso</a></li>
-		<li class='navTreeItem'><a href='/user/preboot'>PreBoot</a></li>
-		<li class='navTreeItem'><a href='/user/bootmenu'>BootMenu</a></li>
-		<li class='navTreeItem'><a href='/user/config'>Config</a></li>
-		<li class='navTreeItem'><a href='/user/bootos'>BootOs</a></li>
-		<li class='navTreeItem'><a href='/user/client'>Client</a></li>
-		<li class='navTreeItem'><a href='/user/filter'>Filter</a></li>
-		<li class='navTreeItem'><a href='/user/pool'>Pool</a></li>
-		<li class='navTreeItem'><a href='/user/session'>Session</a></li>
-		<?php
+		<?php if (Zend_Auth::getInstance()->hasIdentity() && count(Zend_Session::namespaceGet('userIDs')) > 0) {		
+			# This should be splitted
+			if(Pbs_Acl::checkRight('pso') || Pbs_Acl::checkRight('psod'))
+				echo "<li class='navTreeItem'><a href='/user/person'>Person</a></li>";
+			if(Pbs_Acl::checkRight('gso'))
+				echo "<li class='navTreeItem'><a href='/user/group'>Group</a></li>";
+			if(Pbs_Acl::checkRight('ro'))
+				echo "<li class='navTreeItem'><a href='/user/role'>Role</a></li>";
+			if(Pbs_Acl::checkRight('bai') || Pbs_Acl::checkRight('bui'))
+				echo "<li class='navTreeItem'><a href='/user/bootiso'>BootIso</a></li>";
+			if(Pbs_Acl::checkRight('pro'))
+				echo "<li class='navTreeItem'><a href='/user/preboot'>PreBoot</a></li>";
+			if(Pbs_Acl::checkRight('booai') || Pbs_Acl::checkRight('booui'))
+				echo "<li class='navTreeItem'><a href='/user/bootmenu'>BootMenu</a></li>";
+			if(Pbs_Acl::checkRight('csai') || Pbs_Acl::checkRight('csui'))
+				echo "<li class='navTreeItem'><a href='/user/config'>Config</a></li>";
+			if(Pbs_Acl::checkRight('boai') || Pbs_Acl::checkRight('boui'))
+				echo "<li class='navTreeItem'><a href='/user/bootos'>BootOs</a></li>";
+			if(Pbs_Acl::checkRight('clo'))
+				echo "<li class='navTreeItem'><a href='/user/client'>Client</a></li>";
+			if(Pbs_Acl::checkRight('fo'))
+				echo "<li class='navTreeItem'><a href='/user/filter'>Filter</a></li>";
+			if(Pbs_Acl::checkRight('poo'))
+				echo "<li class='navTreeItem'><a href='/user/pool'>Pool</a></li>";
+			if(Pbs_Acl::checkRight('so'))
+				echo "<li class='navTreeItem'><a href='/user/session'>Session</a></li>";		
 		}
 		?>
 		<?php if (!Zend_Auth::getInstance()->hasIdentity()) {?>
diff --git a/pbs.sql b/pbs.sql
index dd81ea3..522fba1 100644
--- a/pbs.sql
+++ b/pbs.sql
@@ -412,6 +412,8 @@ INSERT INTO `pbs`.`pbs_right` (`rightID`, `rightcategoryID`, `shortcut`, `title`
 
 	-- Rollen
 	-- Neue Rollen anlegen
+(NULL, '3', 'ro', 'Show overview of roles', NULL),
+	-- Neue Rollen anlegen
 (NULL, '3', 'ra', 'Add role', NULL),
 	-- Rollen anzeigen
 (NULL, '3', 'rdd', 'Display details of role', NULL),
-- 
cgit v1.2.3-55-g7522


From 753002e3a7f56eb0e797b3871aca8b4cc57be731 Mon Sep 17 00:00:00 2001
From: Simon
Date: Tue, 5 Apr 2011 16:54:12 +0200
Subject: pbs.sql fix

---
 pbs.sql | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pbs.sql')

diff --git a/pbs.sql b/pbs.sql
index 522fba1..aee53e1 100644
--- a/pbs.sql
+++ b/pbs.sql
@@ -356,7 +356,7 @@ INSERT INTO `pbs_rightcategory` (`rightcategoryID`, `title`) VALUES
 (8, 'BootMenu'),
 (9, 'Client'),
 (10, 'Pool'),
-(11, 'Filter');
+(11, 'Filter'),
 (12, 'Session');
 
 -- Insert rights
@@ -552,11 +552,11 @@ INSERT INTO `pbs`.`pbs_right` (`rightID`, `rightcategoryID`, `shortcut`, `title`
 	-- FilterEinträge editieren
 (NULL, '11', 'ffe', 'Edit Filterentry of a Filter', NULL),
 	-- FilterEinträge löschen
-(NULL, '11', 'ffd', 'Delete Filterentry of a Filter', NULL);
+(NULL, '11', 'ffd', 'Delete Filterentry of a Filter', NULL),
 
 	-- Session
 	-- Session Übersicht ansehen
-(NULL, '12', 'so', 'Show overview of Session', NULL),
+(NULL, '12', 'so', 'Show overview of Session', NULL);
 
 -- Adding Super-User
 INSERT INTO `pbs`.`pbs_group` (`groupID` ,`title` ,`description`)VALUES 
-- 
cgit v1.2.3-55-g7522


From 7888e24ada6c3ddd1353fc4f45f7c69bb68963c2 Mon Sep 17 00:00:00 2001
From: Simon
Date: Tue, 5 Apr 2011 16:55:04 +0200
Subject: recht für superadmin vergessen

---
 pbs.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pbs.sql')

diff --git a/pbs.sql b/pbs.sql
index aee53e1..0c7ff40 100644
--- a/pbs.sql
+++ b/pbs.sql
@@ -563,4 +563,4 @@ INSERT INTO `pbs`.`pbs_group` (`groupID` ,`title` ,`description`)VALUES
 (1, 'OpenSLX', 'This is the OpenSLX-Group');
 INSERT INTO `pbs`.`pbs_role` (`roleID`, `groupID`, `title`, `description`, `inheritance`) VALUES (1, '1', 'SuperAdmin', 'The SuperAdmin', 0);
 INSERT INTO `pbs`.`pbs_rightroles` (`roleID`, `rightID`) VALUES
-(1, 1),(1, 2),(1, 3),(1, 4),(1, 5),(1, 6),(1, 7),(1, 8),(1, 9),(1, 10),(1, 11),(1, 12),(1, 13),(1, 14),(1, 15),(1, 16),(1, 17),(1, 18),(1, 19),(1, 20),(1, 21),(1, 22),(1, 23),(1, 24),(1, 25),(1, 26),(1, 27),(1, 28),(1, 29),(1, 30),(1, 31),(1, 32),(1, 33),(1, 34),(1, 35),(1, 36),(1, 37),(1, 38),(1, 39),(1, 40),(1, 41),(1, 42),(1, 43),(1, 44),(1, 45),(1, 46),(1, 47),(1, 48),(1, 49),(1, 50),(1, 51),(1, 52),(1, 53),(1, 54),(1, 55),(1, 56),(1, 57),(1, 58),(1, 59),(1, 60),(1, 61),(1, 62),(1, 63),(1, 64),(1, 65),(1, 66),(1, 67),(1, 68),(1, 69),(1, 70),(1, 71),(1, 72),(1, 73),(1, 74),(1, 75),(1, 76),(1, 77),(1, 78),(1, 79),(1, 80),(1, 81),(1, 82),(1, 83),(1, 84),(1, 85);
+(1, 1),(1, 2),(1, 3),(1, 4),(1, 5),(1, 6),(1, 7),(1, 8),(1, 9),(1, 10),(1, 11),(1, 12),(1, 13),(1, 14),(1, 15),(1, 16),(1, 17),(1, 18),(1, 19),(1, 20),(1, 21),(1, 22),(1, 23),(1, 24),(1, 25),(1, 26),(1, 27),(1, 28),(1, 29),(1, 30),(1, 31),(1, 32),(1, 33),(1, 34),(1, 35),(1, 36),(1, 37),(1, 38),(1, 39),(1, 40),(1, 41),(1, 42),(1, 43),(1, 44),(1, 45),(1, 46),(1, 47),(1, 48),(1, 49),(1, 50),(1, 51),(1, 52),(1, 53),(1, 54),(1, 55),(1, 56),(1, 57),(1, 58),(1, 59),(1, 60),(1, 61),(1, 62),(1, 63),(1, 64),(1, 65),(1, 66),(1, 67),(1, 68),(1, 69),(1, 70),(1, 71),(1, 72),(1, 73),(1, 74),(1, 75),(1, 76),(1, 77),(1, 78),(1, 79),(1, 80),(1, 81),(1, 82),(1, 83),(1, 84),(1, 85),(1, 86);
-- 
cgit v1.2.3-55-g7522

