diff options
| author | Sebastian Schmelzer | 2012-01-11 17:54:11 +0100 |
|---|---|---|
| committer | Sebastian Schmelzer | 2012-01-11 17:54:11 +0100 |
| commit | 119ced43c00d8cc40c0f31da25b5829e9d7c0631 (patch) | |
| tree | fa271ef964769a1dbafd1328bbbcde587b954f63 | |
| parent | cleanup (diff) | |
| download | pbs2-119ced43c00d8cc40c0f31da25b5829e9d7c0631.tar.gz pbs2-119ced43c00d8cc40c0f31da25b5829e9d7c0631.tar.xz pbs2-119ced43c00d8cc40c0f31da25b5829e9d7c0631.zip | |
add favico
| -rw-r--r-- | application/layouts/default.phtml | 2 | ||||
| -rw-r--r-- | application/modules/fbgui/layouts/rz.phtml | 2 | ||||
| -rw-r--r-- | application/modules/user/layouts/user.phtml | 3 | ||||
| -rw-r--r-- | public/favicon.ico | bin | 0 -> 4286 bytes | |||
| -rw-r--r-- | public/index.php | 20 | ||||
| -rw-r--r-- | public/settergetter.php | 26 | ||||
| -rw-r--r-- | setup/pbs.sql | 2 |
7 files changed, 34 insertions, 21 deletions
diff --git a/application/layouts/default.phtml b/application/layouts/default.phtml index a808047..90217f8 100644 --- a/application/layouts/default.phtml +++ b/application/layouts/default.phtml @@ -3,6 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" lang="de" xml:lang="de"> <head> +<link rel="shortcut icon" href="/favicon.ico" type="image/ico" /> + <?php $request = Zend_Controller_Front::getInstance()->getRequest(); $this->headTitle()->append(ucwords($request->getControllerName())); diff --git a/application/modules/fbgui/layouts/rz.phtml b/application/modules/fbgui/layouts/rz.phtml index cecf38e..82dc5ba 100644 --- a/application/modules/fbgui/layouts/rz.phtml +++ b/application/modules/fbgui/layouts/rz.phtml @@ -2,6 +2,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" lang="de" xml:lang="de"> <head> + +<link rel="shortcut icon" href="/favicon.ico" type="image/ico" /> <?php $request = Zend_Controller_Front::getInstance()->getRequest(); diff --git a/application/modules/user/layouts/user.phtml b/application/modules/user/layouts/user.phtml index 6e29106..215ef02 100644 --- a/application/modules/user/layouts/user.phtml +++ b/application/modules/user/layouts/user.phtml @@ -1,6 +1,9 @@ <?php echo $this->doctype(); ?> <html xmlns="http://www.w3.org/1999/xhtml" lang="de" xml:lang="de"> <head> + +<link rel="shortcut icon" href="/favicon.ico" type="image/ico" /> + <?php $request = Zend_Controller_Front::getInstance()->getRequest(); $this->headTitle()->append(ucwords($request->getControllerName())); diff --git a/public/favicon.ico b/public/favicon.ico Binary files differnew file mode 100644 index 0000000..8618a97 --- /dev/null +++ b/public/favicon.ico diff --git a/public/index.php b/public/index.php index 7934852..b631d50 100644 --- a/public/index.php +++ b/public/index.php @@ -9,6 +9,7 @@ * * General information about OpenSLX can be found at http://openslx.org/ */ + // Define path to application directory defined('APPLICATION_PATH') || define('APPLICATION_PATH', realpath(dirname(__FILE__) . '/../application')); @@ -27,15 +28,20 @@ set_include_path(implode(PATH_SEPARATOR, array( require_once 'Zend/Application.php'; // Create application -$application = new Zend_Application( - APPLICATION_ENV, - APPLICATION_PATH . '/configs/application.ini' -); +try { + $application = new Zend_Application( + APPLICATION_ENV, + APPLICATION_PATH . '/configs/application.ini' + ); +} catch (Zend_Config_Exception $e) { + echo "<h2>application.ini not found</h2>"; + echo "<br/> make sure you copied and modified <code>application.ini.dist</code> to <code>application.ini</code>"; +} // Set Session lifetime -if(stristr($_SERVER['HTTP_USER_AGENT'], 'prebootGUI')) - { Zend_Session::setOptions(array('cookie_lifetime' => null)); } -else { +if(stristr($_SERVER['HTTP_USER_AGENT'], 'prebootGUI')) { + Zend_Session::setOptions(array('cookie_lifetime' => null)); +} else { Zend_Session::setOptions(array('cookie_lifetime' => null)); Zend_Session::setOptions(array('gc_maxlifetime' => '1800')); } diff --git a/public/settergetter.php b/public/settergetter.php index 42cda16..f618eda 100644 --- a/public/settergetter.php +++ b/public/settergetter.php @@ -9,23 +9,23 @@ * * General information about OpenSLX can be found at http://openslx.org/ */ + function print_a($v) { echo"<pre style='background-color:#FFCC33'>"; print_r($v); echo"</pre>"; } + function setget($name) { $withdash = $name; $withoutdash = substr($name, 1); return - ' public function get'.ucfirst($withoutdash).'() - { - return $this->'.$withdash.'; -} -public function set'.ucfirst($withoutdash).'($'.$withdash.') -{ -$this->'.$withdash.' = $'.$withdash.'; -} -'; + 'public function get'.ucfirst($withoutdash).'() { + return $this->'.$withdash.'; + } + public function set'.ucfirst($withoutdash).'($'.$withdash.') { + $this->'.$withdash.' = $'.$withdash.'; + }'; } + if(isset($_POST['submit'])) { $ar = explode("\n", trim($_POST['variables'])); @@ -41,11 +41,11 @@ else { ?> Jeweils ein Variablenname pro Zeile : - <br> + <br/> <form method='post' action='<?php $_SERVER['PHP_SELF'];?>'> - <textarea name='variables'> - </textarea> - <br> <input type='submit' name='submit' + <textarea name='variables'></textarea> + <br/> + <input type='submit' name='submit' value='setter und getter generieren'> </form> <?php diff --git a/setup/pbs.sql b/setup/pbs.sql index 227aec7..09bbed8 100644 --- a/setup/pbs.sql +++ b/setup/pbs.sql @@ -294,7 +294,7 @@ ALTER TABLE `pbs_session` ADD CONSTRAINT `pbs_session_ibfk_1` FOREIGN KEY (`clientID`) REFERENCES `pbs_client` (`clientID`) ON DELETE CASCADE, ADD CONSTRAINT `pbs_session_ibfk_2` FOREIGN KEY (`bootosID`) REFERENCES `pbs_bootos` (`bootosID`) ON DELETE SET NULL, ADD CONSTRAINT `pbs_session_ibfk_3` FOREIGN KEY (`bootisoID`) REFERENCES `pbs_bootiso` (`bootisoID`) ON DELETE SET NULL, - ADD CONSTRAINT `pbs_session_ibfk_4` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`) ON DELETE CASCADE; + ADD CONSTRAINT `pbs_session_ibfk_4` FOREIGN KEY (`membershipID`) REFERENCES `pbs_membership` (`membershipID`) ON DELETE CASCADE, ADD CONSTRAINT `pbs_session_ibfk_5` FOREIGN KEY (`personID`) REFERENCES `pbs_person` (`personID`) ON DELETE CASCADE; CREATE TABLE IF NOT EXISTS `pbs_pool` ( |