Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2

5 files changed, 36 insertions, 6 deletions

diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php
index d26f8d4..cf6673c 100644
--- a/application/controllers/IndexController.php
+++ b/application/controllers/IndexController.php
@@ -14,12 +14,13 @@ class IndexController extends Zend_Controller_Action
 			$_SESSION['postdata'] = $_POST;   	
 			$this->_redirect('/fbgui/index/index');	             
         }
-       
-
+		
         // action body
-    } 
 
+       
+    }
 
+	
 }
 
 
diff --git a/application/controllers/StatsController.php b/application/controllers/StatsController.php
new file mode 100644
index 0000000..024eacd
--- /dev/null
+++ b/application/controllers/StatsController.php
@@ -0,0 +1,28 @@
+<?php
+
+class StatsController extends Zend_Controller_Action
+{
+
+    public function init()
+    {
+        $this->_helper->layout->disableLayout();
+		$this->_helper->viewRenderer->setNoRender();
+    }
+    
+    public function graphgroupAction(){
+    	
+		$userIDsNamespace = Zend_Session::namespaceGet('userIDs');
+		
+		if($userIDsNamespace['groupID'] !=''){
+			header("Content-Type: image/png"); 
+    
+			$n = new Pbs_Graph();
+		    $str =  'echo "';
+		    $str .=  $n->graph($userIDsNamespace['groupID']);
+		    $str .=  '" | dot -Tpng  ';		    
+		    
+		    passthru($str);		    
+		}		
+    }
+}
+
diff --git a/application/modules/dev/forms/FilterEvaluate.php b/application/modules/dev/forms/FilterEvaluate.php
index 9922f2b..7fd16c3 100644
--- a/application/modules/dev/forms/FilterEvaluate.php
+++ b/application/modules/dev/forms/FilterEvaluate.php
@@ -12,7 +12,7 @@ class dev_Form_FilterEvaluate extends Zend_Form
     {
 		$this->setName("Test Filter");
 		$this->setMethod('post');
-		$this->setAction('/filter/evaluate');
+		$this->setAction('/dev/filter/evaluate');
 
         $this->addElement('text', 'ip', array(
 			'filters' => array('StringTrim'),
diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php
index bc94db5..91d045d 100644
--- a/application/modules/fbgui/controllers/IndexController.php
+++ b/application/modules/fbgui/controllers/IndexController.php
@@ -30,6 +30,7 @@ class Fbgui_IndexController extends Zend_Controller_Action
         	elseif(isset($_POST['serialnumber'])){
         		
         		$results = $bootisomapper->findBy('serialnumber',$_POST['serialnumber']);
+				print_a($results);
         		$bootiso->setOptions($results[0]);
         		$bootiso->setID($results[0]['bootisoID']);
 	        	$groupID = $bootiso->getGroupID();
@@ -44,7 +45,7 @@ class Fbgui_IndexController extends Zend_Controller_Action
 			$clientID = $client->getID();
         	
 		    $session = new Application_Model_Session();
-		    $session->setBootisoID($_POST['bootisoID']);
+		    $session->setBootisoID($bootiso->getID());
 			$session->setClientID($clientID);
 			$session->setTime(time());
        		$session->setIp($_SERVER['REMOTE_ADDR']);
diff --git a/application/modules/user/views/scripts/index/index.phtml b/application/modules/user/views/scripts/index/index.phtml
index a6e84a7..0f1fab5 100644
--- a/application/modules/user/views/scripts/index/index.phtml
+++ b/application/modules/user/views/scripts/index/index.phtml
@@ -13,6 +13,6 @@
 
 <?php endforeach ?>
 </ul>
-
+<img src='/stats/graphgroup/' />
 <?php endif ?>