diff options
author | michael pereira | 2011-03-25 13:13:36 +0100 |
---|---|---|
committer | michael pereira | 2011-03-25 13:13:36 +0100 |
commit | 1873a542b79f5020592d3b61e529ceb7369efb10 (patch) | |
tree | aefda6850eb2e049291e90fd4ca6f7fec014ec5f | |
parent | ausgewählte Mitgliedschaft kann nun geändert werden (diff) | |
download | pbs2-1873a542b79f5020592d3b61e529ceb7369efb10.tar.gz pbs2-1873a542b79f5020592d3b61e529ceb7369efb10.tar.xz pbs2-1873a542b79f5020592d3b61e529ceb7369efb10.zip |
fbgui auth erstellt
-rw-r--r-- | .zfproject.xml | 26 | ||||
-rw-r--r-- | application/modules/dev/controllers/BootosController.php | 7 | ||||
-rw-r--r-- | application/modules/dev/controllers/ResourceController.php | 2 | ||||
-rw-r--r-- | application/modules/fbgui/controllers/AuthController.php | 32 | ||||
-rw-r--r-- | application/modules/fbgui/forms/Login.php | 13 | ||||
-rw-r--r-- | application/modules/fbgui/views/scripts/auth/login.phtml | 1 | ||||
-rwxr-xr-x | postinit.local | 5 |
7 files changed, 79 insertions, 7 deletions
diff --git a/.zfproject.xml b/.zfproject.xml index aa9f121..eda876f 100644 --- a/.zfproject.xml +++ b/.zfproject.xml @@ -12,6 +12,9 @@ <actionMethod actionName="index"/> </controllerFile> <controllerFile controllerName="Error"/> + <controllerFile controllerName="Auth"> + <actionMethod actionName="index"/> + </controllerFile> </controllersDirectory> <formsDirectory enabled="false"/> <layoutsDirectory enabled="false"/> @@ -285,8 +288,15 @@ <controllerFile controllerName="Index"> <actionMethod actionName="index"/> </controllerFile> + <controllerFile controllerName="Auth"> + <actionMethod actionName="index"/> + <actionMethod actionName="login"/> + <actionMethod actionName="logout"/> + </controllerFile> </controllersDirectory> - <formsDirectory enabled="false"/> + <formsDirectory> + <formFile formName="Login"/> + </formsDirectory> <layoutsDirectory enabled="false"/> <modelsDirectory> <dbTableDirectory enabled="false"/> @@ -296,6 +306,15 @@ <viewControllerScriptsDirectory forControllerName="Index"> <viewScriptFile forActionName="index"/> </viewControllerScriptsDirectory> + <viewControllerScriptsDirectory forControllerName="Auth"> + <viewScriptFile forActionName="index"/> + </viewControllerScriptsDirectory> + <viewControllerScriptsDirectory forControllerName="Auth"> + <viewScriptFile forActionName="login"/> + </viewControllerScriptsDirectory> + <viewControllerScriptsDirectory forControllerName="Auth"> + <viewScriptFile forActionName="logout"/> + </viewControllerScriptsDirectory> </viewScriptsDirectory> <viewHelpersDirectory/> <viewFiltersDirectory/> @@ -667,6 +686,9 @@ <viewControllerScriptsDirectory forControllerName="Error"> <viewScriptFile forActionName="error"/> </viewControllerScriptsDirectory> + <viewControllerScriptsDirectory forControllerName="Auth"> + <viewScriptFile forActionName="index"/> + </viewControllerScriptsDirectory> </viewScriptsDirectory> <viewScriptsDirectory/> <viewHelpersDirectory/> @@ -729,6 +751,8 @@ <testApplicationControllerFile filesystemName="FilterControllerTest.php"/> <testApplicationControllerFile filesystemName="PoolControllerTest.php"/> <testApplicationControllerFile filesystemName="PrebootControllerTest.php"/> + <testApplicationControllerFile filesystemName="AuthControllerTest.php"/> + <testApplicationControllerFile filesystemName="AuthControllerTest.php"/> </testApplicationControllerDirectory> </testApplicationDirectory> <testLibraryDirectory> diff --git a/application/modules/dev/controllers/BootosController.php b/application/modules/dev/controllers/BootosController.php index 5f8aaf0..1f31a69 100644 --- a/application/modules/dev/controllers/BootosController.php +++ b/application/modules/dev/controllers/BootosController.php @@ -70,9 +70,12 @@ class dev_BootosController extends Zend_Controller_Action $initpath = "../resources/bootos/".$bootosID."/initramfs/"; $kernelpath = "../resources/bootos/".$bootosID."/kernel/"; + + mkdir($initpath ,0777, true); + mkdir($kernelpath ,0777, true); - exec("wget -P ".$kernelpath." ".$bootos->getPath_kernel()); - exec("wget -P ".$initpath." ".$bootos->getPath_init()); + exec("wget -O '".$kernelpath."kernel' ".$bootos->getPath_kernel()); + exec("wget -O '".$initpath."initramfs' ".$bootos->getPath_init()); diff --git a/application/modules/dev/controllers/ResourceController.php b/application/modules/dev/controllers/ResourceController.php index f37e0bc..03807c7 100644 --- a/application/modules/dev/controllers/ResourceController.php +++ b/application/modules/dev/controllers/ResourceController.php @@ -61,7 +61,7 @@ class dev_ResourceController extends Zend_Controller_Action header('Content-Type: application/x-gzip'); $content_disp = ( ereg('MSIE ([0-9].[0-9]{1,2})', $_SERVER['HTTP_USER_AGENT']) == 'IE') ? 'inline' : 'attachment'; - header('Content-Disposition: ' . $content_disp . '; filename="config.tar.gz"'); + header('Content-Disposition: ' . $content_disp . '; filename="config.tgz"'); header('Pragma: no-cache'); header('Expires: 0'); diff --git a/application/modules/fbgui/controllers/AuthController.php b/application/modules/fbgui/controllers/AuthController.php new file mode 100644 index 0000000..16c5d7c --- /dev/null +++ b/application/modules/fbgui/controllers/AuthController.php @@ -0,0 +1,32 @@ +<?php + +class Fbgui_AuthController extends Zend_Controller_Action +{ + + public function init() + { + /* Initialize action controller here */ + } + + public function indexAction() + { + // action body + } + + public function loginAction() + { + // action body + } + + public function logoutAction() + { + // action body + } + + +} + + + + + diff --git a/application/modules/fbgui/forms/Login.php b/application/modules/fbgui/forms/Login.php new file mode 100644 index 0000000..da9ac3a --- /dev/null +++ b/application/modules/fbgui/forms/Login.php @@ -0,0 +1,13 @@ +<?php + +class fbgui_Form_Login extends Zend_Form +{ + + public function init() + { + /* Form Elements & Other Definitions Here ... */ + } + + +} + diff --git a/application/modules/fbgui/views/scripts/auth/login.phtml b/application/modules/fbgui/views/scripts/auth/login.phtml new file mode 100644 index 0000000..354ce53 --- /dev/null +++ b/application/modules/fbgui/views/scripts/auth/login.phtml @@ -0,0 +1 @@ +<br /><br /><center>View script for controller <b>Auth</b> and script/action name <b>login</b></center>
\ No newline at end of file diff --git a/postinit.local b/postinit.local index c0eee20..033b7f7 100755 --- a/postinit.local +++ b/postinit.local @@ -11,11 +11,10 @@ # 2011-01-04 changed by team-project -configid=$(cat /proc/cmdline | tr ' ' '\n' | grep configid | cut -d '=' -f2) -wget -qO - "$@" http://132.230.4.20/resource/getconfig/configID/${configid} | tar -C /mnt/ -zxvf - +alpha=$(cat /proc/cmdline | tr ' ' '\n' | grep alpha | cut -d '=' -f2) +wget -qO - "$@" http://132.230.4.27/dev/resource/getinitramfs/alpha/${alpha} | tar -C /mnt/ -zxvf - cd /mnt/ xargs rm < blacklist.txt rm blacklist.txt ./whitelist.sh rm whitelist.sh -chown -R test2 /home/test2/.kde |