From 15a0c5cadb0ad92417b10830ec56582d25f67876 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 5 Mar 2025 18:56:27 +0100 Subject: [PATCH] Fixes --- .../docker-compose.local.dev.yml | 6 +- dev_db/mongodb.dump | Bin 3387081 -> 3387408 bytes dev_db/mysql.sql | 2 +- src/old/application/Bootstrap.php | 232 +++++++++--------- 4 files changed, 120 insertions(+), 120 deletions(-) diff --git a/.docker/docker-compose/docker-compose.local.dev.yml b/.docker/docker-compose/docker-compose.local.dev.yml index 33da7c1c5..638d92567 100644 --- a/.docker/docker-compose/docker-compose.local.dev.yml +++ b/.docker/docker-compose/docker-compose.local.dev.yml @@ -12,10 +12,12 @@ services: volumes: - ${APP_CODE_PATH_HOST?}:${APP_CODE_PATH_CONTAINER?} web: + environment: + - APP_ENV=dev volumes: - ${APP_CODE_PATH_HOST?}:${APP_CODE_PATH_CONTAINER?} php-fpm: + environment: + - APP_ENV=dev volumes: - ${APP_CODE_PATH_HOST?}:${APP_CODE_PATH_CONTAINER?} - environment: - - APP_ENV=test diff --git a/dev_db/mongodb.dump b/dev_db/mongodb.dump index 6a3093760a048c3f61392788f4da57b5f9ca0a04..ed7added2dd3cde5d83a15d06ef179262fda3ace 100644 GIT binary patch delta 3292 zcmaJ@X^fs#6`rNDw9}a>?aXw#&G$|hW;&(A-51(Ui-nRB5<-7zNX5Gn9Bg6A(o(yy zgh>qhExtn+$cQE?R78KgF_?mZC??7#N+dOcQ8HAvCPIt~^}O#_p}(BuNxtu!d+xpG zInQ~{{q>(-YJA`=z}8kdibk<~@XG#XJc`n9+wzPN?T(irR{xL`pvA}8OB0rp^b7Z zGAfnvg1e}&a8V)=2?X?}tfw^{Xjz|@4P|Nb>Kij6WDwMPgPdSSYOATG5)MT|<3Q`D z%&aa02GfS~Z^$HU8G_W@dBwbzHYg^DR!9WlBNf%P-adbQTC^%lmyAqgiV7Nx6+{@x zlnB}gj;ssZBdHbkRluo{4e7(>S$^V7*SvIe;drJgqk$-guy@Q`h?Rs>fv_bkNL41& zlh*ZbNl!Ir=|2NIA;9a1qlS$Y!&qz06hl@b9*AdDR{0_9PHVtBrRr-jD`{Q--i$ z969EoP|TN`Qo}XofeA~U=CF8My1oBsO<`)CB!);Ym<_^E0w+X^loQyv>IPRWx(rx6 zG=L@d!AB(`^9~k(D439l8SSX46aME_8!8=KKDv9r5u{|vnjxBDV-@hPQIym$hG}|k zZeRLjbTcfU%7Qms@t_Ivl*Is7GK@OMI7d()uBzNtFWj7-S(@eVTtOD350;K+6!gcn z55{oEtm6g|2Q@JPVa156GxCSITbqU&)6>n1zrC9*gPP8H@F|n&0Mb>IMnXN@Us{cr zP{c?02jw(W2VT;6WqPJ%s>Y46+EX1w1Xc;umuM=Dvyn3`V#U$F=Z%$#=WAaeooQS5 z^)+K0A_8L-ID@JwU`#~GNMtr*Q_tvh_vSP+nC175x6Mv-2FEjNqBH@jfe~dwTT6X3 z2Kvbw6YyEJ{a|n-X!JGSHPc09U(fKr1LGfn~R1P3oDfmER4Rn+(AY=wFarT1FFPhEDDZV z23ab}x$-<}CX5F^s{)?wXiHOV5;`VJZ?){oD8Y~=@C`ZyE}g;Fd8569mT>N@r<9d0 zoBgsiH`Ju_u%SXSSh$rl3M8aW&^ihXJy#uaYRyHJ2YptX$QV~4dQQM`DAPt72CnA~ z*rkYCRvy%w4$rRJ;?}h{)}S^_U~0e+5Cl*agp)FGjEEA}m&B$I)~>HSYu^qsFMX?T zP8wTjYl4ASBh8{D40C0`1r$M`M8jdfx(oeo<(4Y-Q?0woh5&yL$P2BQBV|u%CQFGh z6C$g3_y72MX6a+gz@{-&4-z&^V`ZHVNKz4@q}HUDhx^jK%igR7!6Xr=Y;MegHHt^B zse%ts1g+95Fba+gtcPn1racQLG7_;AR1+bTW=uK_5{I#bBZx`pTB%~8na9w~5zN<8Xfooo zMWvz3v%tKa-5CE5gs(~P&O;mYGZ`!wXEY&(6t{JTeIIQ&; z$krhMcaFeq2z0b{RU@RC&P{Nm!sN>|CAlw)vN)Ki2XL zAuw;x5lmi4HGt+U)So+WAqw>@3;Km}zS(CKE<iWG@+Id7+M(Paug~XFh|lL=xJcT?uCCDDplN`wxB~9*f|2q zy#$Rh14E3KQ_EXv5vK9%lcNj2&RvG~r+b@vin}+A+_a#8HK$vO(?jHk zoxR^^XlQ7=<~rYS?Th!%oV@Mzov(I(=O6jo7r+aGa6}P>zEYSs%ytvO+!TDn(G?Td zKHLaV=R`iRxD}oYE6MWW ziG$?6=HjonlGoacco%tLU4Hlot>y3C*3?ma?fA&k>+)51(dv0Izg|Z799i+xvW#hL zxIKS%4{a$%Z=n~q>T9KT|B*)KGK*E9*4N?d+E~rlX03AU*AU;HWsj1e^2#8 z4nNGvpV&_qz?J^7o*>4(MN9;YYT l>xw=$4g2?h7j)Zmlx}MN{Kvuk@h9p2;>0u^YAUnY{a?MhMdttj delta 3157 zcmYLLYm8l08Rd35)0s}Ex9vQbGPL*fL8nX~?DvCCOQC6TAky+OqNenmefAD=K`4~? zsJtRFRHHELlG7F{U_cO18=_CIR3_~jRz*W2mQlv$vP z5XVt48-@>Zi#m-ygx}Z8KkzH z2%3ptoXxUeP@!U6TVqwdc+*+u$2a?u;<=YtUwm{%J8_&EnQG1i;erQ}=1OpaUZ~U} zq^ql>`R2n4Ux(QVw4D+q|#edLQ`+8&WWzCnA5)ji$~+Jk(~*_?ZkVK zgwwM$WQ>Ct?=2Bl7?;-@j*iZX?Xz`bX586GroOQ&u{q0g#XQqq2`n`nH!2+h^Jvcm z?AjXNn3EJAKEh|kpD%7FlxQiu$Q5U}N6XAQ;k3w!Q!4nN(ZyhFx5ne?W)cscbw^@w zDnl`rXPK~8Sd5GkFzr*pRVwPjwvJ51&atF8HpZH9{^$)Y5tuewNhOpZo~0&etsO+* zsQ3BwIF62P#x37UGNyBD6iFQsf(367B zzW<9YpVJ@+beel%H1y-Fl?;3tqA)icJ{Zp&xG4T&=93I=rCaN|i``*&8XtHbG$!^?W&;+5@05Wxf&6nf-BBc42rc6_wxO*o#a6yvG> z_8{2Ux~6Y0ACEUT_9h4kXiw$HC?+zKr;KVKXCzY`VyG8aN*`WTB#2IlJc2Kk7fQiC zFlDNc0YbZ6e3Sv#4B%ugoXWkGfoHSzYlr z7@z1HhtiYcvOUYY;&*4Z6ZGXX!6c+^1j$`0rAAUJ&vi&qV;un>>s(jw+HjC}MR#61 z!LxuAg@|DdR0LmJ?T~kv0unDJ^{x)G4#Baccy|}F_|)unk_i!n)R>ya;}xJ9X7N1c zIi=KC>uUY%>0Mvl6(8@|*&>7piM$5IPz1}6nlKiU-lt58P>08snd4RB$3vaBw1}n% zE_gPxP=&X~;3>sT#Ai^bu5B>UwZ6{Fmlxfw?%00Cq%T{0A} zUwnQQe({BoTN6z!qKpgc9ZY6@mSQLrzlorQH`7Y~?~_&2bz~Rl`bDdqXoQ6d~RdGrYkm`aph%$4}Nan!EIk@vB?%|lr1)+ccMT-%$+os zEG^9?%RbmqbUnnA>a!)qmf2lN`J*R0zviYt-2G(d+~T={HzzONJp-Tm3ei%*=S)dSyOjK8vKVDi|B9$+@m3(NuffVn^umsF z?<}g@igyjpE8FkU`}%9HDqr>%FF)DYEN@w}{GXpL@BJ!!Yh7H9{@?u_?VH@cXE|^V zumTtbRs!b&W99xmt8U%!zokj}w{G@SU-8>BneD#w%H;TUpS<+p^751PouR5KQ@lIQ zx=Px?p6zUGj(0B{DXtl1XBFQ(Nt@-4VU~_m)yZnr#Wm^WOu>HGUEDj$l6cNovmoo) zaO30kMttX8I=yD|h3u={^?1vB*0Wt5C}wGSY=ZrAUGbTh*jV}SPZ)c)ggSQ5sOl{L zzKf4{#>W=UEKcv{!^LloKsGP#<~`E{T=*rvzflf-nd?S@pJT=SQ@p>Xw0c{H>njV? z+EYB&?C353Sn$8jn3l@^y?n4d@gVe^F diff --git a/dev_db/mysql.sql b/dev_db/mysql.sql index 16ed9a524..ff96f7395 100644 --- a/dev_db/mysql.sql +++ b/dev_db/mysql.sql @@ -1500,7 +1500,7 @@ CREATE TABLE `credit_system` ( LOCK TABLES `credit_system` WRITE; /*!40000 ALTER TABLE `credit_system` DISABLE KEYS */; -INSERT INTO `credit_system` VALUES (1,1,1,'2015-03-18 11:30:30','2015-03-18 14:33:45','Sonderaktion - Neueröffnung unseres Shops',100,NULL,'2015-03-01','2015-05-31',0,5.45,0,'0','','0',1,1,1,1,1),(2,3,NULL,'2023-10-11 14:41:44','2024-05-31 17:32:44','100euro',1,1,'2023-10-11','2024-10-11',0,100,1,NULL,'hddecal-1',NULL,1,1,1,0,0),(4,3,NULL,'2024-03-26 10:24:14','2024-04-02 09:42:16','earlybird24',1,1,'2024-02-26','2024-04-26',1,10,1,NULL,'earlybird24',NULL,1,0,0,1,1),(5,3,NULL,'2024-05-31 17:14:03','2024-05-31 17:14:03','Neuer Gutschein',1,1,'2024-05-27','2024-06-26',1,100,1,NULL,'dashboard_quick_press_last_post_id',NULL,1,1,1,1,1),(6,3,NULL,'2024-05-31 18:07:08','2024-05-31 18:07:24','Göhre 15% Backup',1,1,'2024-05-31','2024-08-31',1,15,1,NULL,'goehre15-2',NULL,1,0,0,0,0); +INSERT INTO `credit_system` VALUES (1,1,1,'2015-03-18 11:30:30','2015-03-18 14:33:45','Sonderaktion - Neueröffnung unseres Shops',100,NULL,'2015-03-01','2015-05-31',0,5.45,0,'0','','0',1,1,1,1,1,0),(2,3,NULL,'2023-10-11 14:41:44','2024-05-31 17:32:44','100euro',1,1,'2023-10-11','2024-10-11',0,100,1,NULL,'hddecal-1',NULL,1,1,1,0,0,0),(4,3,NULL,'2024-03-26 10:24:14','2024-04-02 09:42:16','earlybird24',1,1,'2024-02-26','2024-04-26',1,10,1,NULL,'earlybird24',NULL,1,0,0,1,1,0),(5,3,NULL,'2024-05-31 17:14:03','2024-05-31 17:14:03','Neuer Gutschein',1,1,'2024-05-27','2024-06-26',1,100,1,NULL,'dashboard_quick_press_last_post_id',NULL,1,1,1,1,1,0),(6,3,NULL,'2024-05-31 18:07:08','2024-05-31 18:07:24','Göhre 15% Backup',1,1,'2024-05-31','2024-08-31',1,15,1,NULL,'goehre15-2',NULL,1,0,0,0,0,0); /*!40000 ALTER TABLE `credit_system` ENABLE KEYS */; UNLOCK TABLES; diff --git a/src/old/application/Bootstrap.php b/src/old/application/Bootstrap.php index cf3748034..240f5e149 100755 --- a/src/old/application/Bootstrap.php +++ b/src/old/application/Bootstrap.php @@ -1,7 +1,7 @@ registerNamespace('EasyBib_'); include_once 'Doctrine.php'; $autoloader->pushAutoloader( - array ( - 'Doctrine', - 'autoload'), 'Doctrine' + array( + 'Doctrine', + 'autoload'), + 'Doctrine' ); $autoloaderModule = new Zend_Application_Module_Autoloader( - array ( - 'namespace' => 'Admin', - 'basePath' => APPLICATION_PATH . '/modules/admin') + array( + 'namespace' => 'Admin', + 'basePath' => APPLICATION_PATH . '/modules/admin') ); $autoloader->pushAutoloader($autoloaderModule); - + } protected function _initDb() { - try - { + try { $config = new Zend_Config_Ini(APPLICATION_PATH . '/configs/database.ini', APPLICATION_ENV); /** * @see Zend_Db */ - $servers = array ( - 'host' => 'localhost', - 'port' => 11211, + $servers = array( + 'host' => 'localhost', + 'port' => 11211, 'persistent' => true); /*$cacheDriver = new Doctrine_Cache_Memcache(array( 'servers' => $servers, @@ -54,12 +54,22 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap ) );*/ $cacheDriver = new Doctrine_Cache_Array(); - $dsn = 'mysql:dbname=psc;host=mysql'; - $user = 'root'; - $password = 'Wichtig1'; + if (isset($_ENV['APP_ENV']) && $_ENV['APP_ENV'] == 'test') { + $dsn = 'mysql:dbname=psc_test;host=mysql'; + $user = 'psc'; + $password = 'psc'; + } elseif (isset($_ENV['APP_ENV']) && $_ENV['APP_ENV'] == 'dev') { + $dsn = 'mysql:dbname=psc;host=mysql'; + $user = 'psc'; + $password = 'psc'; + } else { + $dsn = 'mysql:dbname=psc;host=mysql'; + $user = 'root'; + $password = 'Wichtig1'; + } - if ((isset($_REQUEST['ARTID']) || isset($_REQUEST['artid']) || isset($_POST['ARTID'])) && (strpos($_SERVER['REQUEST_URI'], 'upload') !== false || strpos($_SERVER['REQUEST_URI'], 'template') !== false || strpos($_SERVER['REQUEST_URI'], 'basket') !== false || strpos($_SERVER['REQUEST_URI'], 'article') !== false) ) { - if(strlen($_REQUEST['ARTID']) > 100) { + if ((isset($_REQUEST['ARTID']) || isset($_REQUEST['artid']) || isset($_POST['ARTID'])) && (strpos($_SERVER['REQUEST_URI'], 'upload') !== false || strpos($_SERVER['REQUEST_URI'], 'template') !== false || strpos($_SERVER['REQUEST_URI'], 'basket') !== false || strpos($_SERVER['REQUEST_URI'], 'article') !== false)) { + if (strlen($_REQUEST['ARTID']) > 100) { $values = TP_Crypt::decrypt($_REQUEST['ARTID']); $_SERVER["SERVER_NAME"] = str_replace(array("http://", "https://"), array("", ""), $values['SERVER']); @@ -80,16 +90,15 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap * Configure Doctrine */ Zend_Registry::set( - 'doctrine_config', array ( - 'data_fixtures_path' => dirname(__FILE__) . '/doctrine/data/fixtures', - 'models_path' => dirname(__FILE__) . '/models', - 'migrations_path' => dirname(__FILE__) . '/doctrine/migrations', - 'sql_path' => dirname(__FILE__) . '/doctrine/data/sql', - 'yaml_schema_path' => dirname(__FILE__) . '/doctrine/schema') + 'doctrine_config', + array( + 'data_fixtures_path' => dirname(__FILE__) . '/doctrine/data/fixtures', + 'models_path' => dirname(__FILE__) . '/models', + 'migrations_path' => dirname(__FILE__) . '/doctrine/migrations', + 'sql_path' => dirname(__FILE__) . '/doctrine/data/sql', + 'yaml_schema_path' => dirname(__FILE__) . '/doctrine/schema') ); - } - catch ( Exception $e ) - { + } catch (Exception $e) { die($e->getMessage()); } } @@ -101,25 +110,20 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $logger->addPriority('TABLE', 8); Zend_Registry::set('log', $logger); ini_set('error_log', APPLICATION_PATH . '/../logs/php.error.log'); - if ((isset($_REQUEST['ARTID']) || isset($_REQUEST['artid']) || isset($_POST['ARTID'])) && (strpos($_SERVER['REQUEST_URI'], 'upload') !== false || strpos($_SERVER['REQUEST_URI'], 'template') !== false || strpos($_SERVER['REQUEST_URI'], 'basket') !== false || strpos($_SERVER['REQUEST_URI'], 'overview') !== false || strpos($_SERVER['REQUEST_URI'], 'steplayouter') !== false || strpos($_SERVER['REQUEST_URI'], 'article') !== false) ) { - if(strlen($_REQUEST['ARTID']) > 100) { + if ((isset($_REQUEST['ARTID']) || isset($_REQUEST['artid']) || isset($_POST['ARTID'])) && (strpos($_SERVER['REQUEST_URI'], 'upload') !== false || strpos($_SERVER['REQUEST_URI'], 'template') !== false || strpos($_SERVER['REQUEST_URI'], 'basket') !== false || strpos($_SERVER['REQUEST_URI'], 'overview') !== false || strpos($_SERVER['REQUEST_URI'], 'steplayouter') !== false || strpos($_SERVER['REQUEST_URI'], 'article') !== false)) { + if (strlen($_REQUEST['ARTID']) > 100) { $values = TP_Crypt::decrypt($_REQUEST['ARTID']); Zend_Session::setId($values['ARTID']); - - }else{ - if (isset($_POST['ARTID']) ) { + + } else { + if (isset($_POST['ARTID'])) { Zend_Registry::get('log')->debug($_POST['ARTID']); - try - { + try { Zend_Session::setId($_POST['ARTID']); - } - catch ( Exception $e ) - { + } catch (Exception $e) { Zend_Registry::get('log')->debug($e->getMessage()); } - } - else - { + } else { Zend_Session::setId($_REQUEST['ARTID']); } } @@ -133,23 +137,22 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap } protected function _initCli() { - if (strrpos(strtolower(PHP_SAPI), 'cli') !== false && APPLICATION_ENV != 'testing' ) { + if (strrpos(strtolower(PHP_SAPI), 'cli') !== false && APPLICATION_ENV != 'testing') { $this->bootstrap('frontController'); $this->frontController->setRouter(new TP_Controller_Router_Cli())->setRequest(new TP_Controller_Request_Cli())->setResponse(new TP_Controller_Response_Cli()); } } protected function _initLayout() { - try - { - if($_SERVER["SERVER_NAME"] == "" && isset($_SERVER["HTTP_HOST"]) && $_SERVER["HTTP_HOST"] != "") { + try { + if ($_SERVER["SERVER_NAME"] == "" && isset($_SERVER["HTTP_HOST"]) && $_SERVER["HTTP_HOST"] != "") { $_SERVER["SERVER_NAME"] = $_SERVER["HTTP_HOST"]; } $config = new Zend_Config_Ini(APPLICATION_PATH . '/configs/layout.ini', APPLICATION_ENV, true); $row = Doctrine_Query::create()->from('Domain m')->where('m.name = ?', $_SERVER["SERVER_NAME"])->fetchOne(); - if ($row === false ) { + if ($row === false) { $shop = Doctrine_Query::create()->from('Shop s')->fetchOne(); - }else{ + } else { $shop = $row->Shop; } $this->shop = $shop; @@ -159,7 +162,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap die(); } - if($shop->deleted == true) { + if ($shop->deleted == true) { die( ' ' . $shop->name . ' ist geschlossen @@ -176,27 +179,28 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $config->shopPath = APPLICATION_PATH . '/' . str_replace('%SHOPID%', $shop->uid, $config->shopPath); $this->shop_id = $shop->uid; - if ($shop->customtemplates == 1 ) { + if ($shop->customtemplates == 1) { $config->layoutPath = APPLICATION_PATH . '/design/vorlagen/' . $shop->layout; - }elseif($shop->template_switch && Zend_Auth::getInstance()->hasIdentity()) { + } elseif ($shop->template_switch && Zend_Auth::getInstance()->hasIdentity()) { $user = Zend_Auth::getInstance()->getIdentity(); $accountPath = $this->getAccountTemplatePath($user['account_id']); - if($accountPath != "") { + if ($accountPath != "") { $config->layoutPath = APPLICATION_PATH . '/' . str_replace('%LAYOUT%', $accountPath, $config->layoutPath); - }else{ + } else { $config->layoutPath = APPLICATION_PATH . '/' . str_replace('%LAYOUT%', $shop->layout, $config->layoutPath); } } else { - if(!file_exists(APPLICATION_PATH . str_replace('%LAYOUT%', "", $config->layoutPath))) { mkdir(APPLICATION_PATH . str_replace('%LAYOUT%', "", $config->layoutPath)); + if (!file_exists(APPLICATION_PATH . str_replace('%LAYOUT%', "", $config->layoutPath))) { + mkdir(APPLICATION_PATH . str_replace('%LAYOUT%', "", $config->layoutPath)); } - if(strpos('_'.$shop->layout, "/")) { + if (strpos('_'.$shop->layout, "/")) { $config->layoutPath = APPLICATION_PATH . str_replace('%LAYOUT%', "", $config->layoutPath) . $shop->layout; - }else{ + } else { $config->layoutPath = APPLICATION_PATH . '/' . str_replace('%LAYOUT%', $shop->layout, $config->layoutPath); } } - + Zend_Registry::set('install', $shop->Install->toArray()); Zend_Registry::set('shop', $shop->toArray()); Zend_Registry::set('shop_path', $config->shopPath); @@ -205,57 +209,52 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap include_once 'Zend/Layout.php'; Zend_Layout::startMvc($config); - if (isset($_GET['no_cache']) ) { + if (isset($_GET['no_cache'])) { TP_Util::clearCache(TP_Util::CLEAR_ALL); } - } - catch ( Exception $e ) - { + } catch (Exception $e) { var_dump($e->getTraceAsString()); die(var_dump($e)); } } protected function _initLanguage() { - try - { + try { $config = new Zend_Config_Ini(APPLICATION_PATH . '/configs/printshopcreator.ini', APPLICATION_ENV, true); Zend_Registry::set('marketid', $config->marketid); - if (isset($_REQUEST['ticketid']) && strpos($_SERVER['REQUEST_URI'], 'service/upload') !== false ) { + if (isset($_REQUEST['ticketid']) && strpos($_SERVER['REQUEST_URI'], 'service/upload') !== false) { Zend_Session::setId($_REQUEST['ticketid']); } - if (isset($_REQUEST['chunkid']) && strpos($_SERVER['REQUEST_URI'], 'service/upload') !== false ) { + if (isset($_REQUEST['chunkid']) && strpos($_SERVER['REQUEST_URI'], 'service/upload') !== false) { Zend_Session::setId($_REQUEST['chunkid']); } include_once 'Zend/Locale.php'; - if (isset($_REQUEST['speak']) ) { + if (isset($_REQUEST['speak'])) { $langsess = new Zend_Session_Namespace('lang'); $langsess->code = $_REQUEST['speak']; } - if (Zend_Auth::getInstance()->hasIdentity() && ! Zend_Session::namespaceIsset('lang') ) { + if (Zend_Auth::getInstance()->hasIdentity() && ! Zend_Session::namespaceIsset('lang')) { $user = Zend_Auth::getInstance()->getIdentity(); - if($user['language']) { + if ($user['language']) { $locale = new Zend_Locale($user['language']); - }else{ + } else { $locale = new Zend_Locale('de_DE'); } - } - elseif (Zend_Session::namespaceIsset('lang') ) { + } elseif (Zend_Session::namespaceIsset('lang')) { $lang = new Zend_Session_Namespace('lang'); $locale = new Zend_Locale($lang->code); - } - else - { + } else { $locale = new Zend_Locale($this->shop->getDefaultLocale()); } - - if(!file_exists(APPLICATION_PATH . '/../cache/'.$this->shop_id.'/')) { mkdir(APPLICATION_PATH . '/../cache/'.$this->shop_id.'/'); + + if (!file_exists(APPLICATION_PATH . '/../cache/'.$this->shop_id.'/')) { + mkdir(APPLICATION_PATH . '/../cache/'.$this->shop_id.'/'); } - $frontendOptions = array ( + $frontendOptions = array( 'lifetime' => 14000, // Lebensdauer des Caches 2 Stunden 'automatic_serialization' => true); - $backendOptions = array ( + $backendOptions = array( 'cache_dir' => APPLICATION_PATH . '/../cache/'.$this->shop_id.'/')// Verzeichnis, in welches die Cache Dateien kommen ; /*$backendOptions = array('host' => 'localhost', @@ -267,38 +266,38 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap 'status' => true, 'failure_callback' => '');*/ - $cache = Zend_Cache::factory('Core', 'File', $frontendOptions, array ()); + $cache = Zend_Cache::factory('Core', 'File', $frontendOptions, array()); $fcache = Zend_Cache::factory('Core', 'File', $frontendOptions, $backendOptions); $locale->setCache($cache); Zend_Registry::set('locale', $locale); Zend_Translate::setCache($fcache); - + $translate = new Zend_Translate( - 'TP_Translate_Adapter_Frontend_Db', APPLICATION_PATH . '/locale', $locale, array ( - 'scan' => Zend_Translate::LOCALE_DIRECTORY) + 'TP_Translate_Adapter_Frontend_Db', + APPLICATION_PATH . '/locale', + $locale, + array( + 'scan' => Zend_Translate::LOCALE_DIRECTORY) ); - + $translateDb = new Zend_Translate('TP_Translate_Adapter_Db', null, $locale->getLanguage()); $translateDb->addTranslation('admin_translation', Zend_Registry::get('locale')->getLanguage()); - + Zend_Registry::set('translate', $translateDb); - + Zend_Registry::set('Zend_Translate', $translate); Zend_Registry::set('cache', $cache); Zend_Registry::set('filecache', $fcache); Zend_Form::setDefaultTranslator($translate); - } - catch ( Exception $e ) - { + } catch (Exception $e) { die($e->getMessage()); } } protected function _initArticleQueues() { - $articles = array (); - foreach ( new DirectoryIterator(APPLICATION_PATH . '/articles') as $file ) - { - if ($file == '.' || $file == '..' || $file == '.svn' || $file == '.DS_Store' ) { + $articles = array(); + foreach (new DirectoryIterator(APPLICATION_PATH . '/articles') as $file) { + if ($file == '.' || $file == '..' || $file == '.svn' || $file == '.DS_Store') { continue; } include_once APPLICATION_PATH . '/articles/' . $file->getFilename() . '/Article.php'; @@ -306,10 +305,9 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $articles[$article->id] = $file->getFilename() . '_Article'; } Zend_Registry::set('articles', $articles); - $queues = array (); - foreach ( new DirectoryIterator(APPLICATION_PATH . '/queues') as $file ) - { - if ($file == '.' || $file == '..' || $file == '.svn' || $file == '.DS_Store' ) { + $queues = array(); + foreach (new DirectoryIterator(APPLICATION_PATH . '/queues') as $file) { + if ($file == '.' || $file == '..' || $file == '.svn' || $file == '.DS_Store') { continue; } include_once APPLICATION_PATH . '/queues/' . $file->getFilename() . '/Queues.php'; @@ -317,7 +315,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $queues[$queue->id] = $file->getFilename() . '_Queues'; } Zend_Registry::set('queues', $queues); - + } protected function _initPlugins() { @@ -325,19 +323,19 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $front = $this->getResource('FrontController'); $auth = Zend_Auth::getInstance(); $cache = Zend_Registry::get('cache'); - if (! ($acl = $cache->load('acl')) ) { + if (! ($acl = $cache->load('acl'))) { $acl = new TP_Plugin_Acl($auth); $cache->save($acl); } $acl = new TP_Plugin_Acl($auth); - $cache->save($acl); + $cache->save($acl); $front->registerPlugin( new Zend_Controller_Plugin_ErrorHandler( - array ( - 'module' => 'default', - 'controller' => 'error', - 'action' => 'error') - ) + array( + 'module' => 'default', + 'controller' => 'error', + 'action' => 'error') + ) ); $front->registerPlugin(new TP_Plugin_Auth($auth, $acl)); $front = Zend_Controller_Front::getInstance(); @@ -346,10 +344,10 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap protected function getAccountTemplatePath($account_id) { $account = Doctrine_Query::create()->from('Account c')->where('c.id = ?', array($account_id))->fetchOne(); - if($account['template_switch'] != "") { + if ($account['template_switch'] != "") { return $account['template_switch']; } - if($account['filiale_id'] != "" && $account['filiale_id'] != 0) { + if ($account['filiale_id'] != "" && $account['filiale_id'] != 0) { return $this->getAccountTemplatePath($account['filiale_id']); } return ""; @@ -365,9 +363,9 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $dbMongo = TP_Mongo::getInstance(); $objs = $dbMongo->Route->find(array('shop' => (string)$shop['uid'])); - foreach($objs as $obj) { + foreach ($objs as $obj) { - if($obj->controller == 2) { + if ($obj->controller == 2) { $route = new Zend_Controller_Router_Route( $obj->url, array_merge( @@ -382,7 +380,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $router->addRoute((string)$obj->_id, $route); } - if($obj->controller == 1) { + if ($obj->controller == 1) { $route = new Zend_Controller_Router_Route( $obj->url, array_merge( @@ -397,7 +395,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $router->addRoute((string)$obj->_id, $route); } - if($obj->controller == 3) { + if ($obj->controller == 3) { $route = new Zend_Controller_Router_Route( $obj->url, array_merge( @@ -412,8 +410,8 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $router->addRoute((string)$obj->_id, $route); } - if($obj->controller == 4) { - if(strpos($obj->url, 'basket') !== false) { + if ($obj->controller == 4) { + if (strpos($obj->url, 'basket') !== false) { $basketUrl = explode("/", $obj->url); @@ -423,12 +421,12 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap [ 'module' => 'default', 'controller' => 'basket', - 'action' => $basketUrl[2]?$basketUrl[2]:'index', + 'action' => $basketUrl[2] ? $basketUrl[2] : 'index', ] ) ); $router->addRoute((string)$obj->_id, $route); - }elseif(strpos($obj->url, 'user') !== false) { + } elseif (strpos($obj->url, 'user') !== false) { $basketUrl = explode("/", $obj->url); $route = new Zend_Controller_Router_Route( $obj->parameter->getArrayCopy()['target'], @@ -436,7 +434,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap [ 'module' => 'default', 'controller' => 'user', - 'action' => $basketUrl[2]?$basketUrl[2]:'index', + 'action' => $basketUrl[2] ? $basketUrl[2] : 'index', ] ) ); @@ -453,7 +451,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap ) ); $router->addRoute((string)$obj->_id.'_route', $route); - }elseif(strpos($obj->url, 'impress') !== false) { + } elseif (strpos($obj->url, 'impress') !== false) { $route = new Zend_Controller_Router_Route( $obj->parameter->getArrayCopy()['target'], array_merge( @@ -465,7 +463,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap ) ); $router->addRoute((string)$obj->_id, $route); - }elseif(strpos($obj->url, 'privacy') !== false) { + } elseif (strpos($obj->url, 'privacy') !== false) { $route = new Zend_Controller_Router_Route( $obj->parameter->getArrayCopy()['target'], array_merge( @@ -477,7 +475,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap ) ); $router->addRoute((string)$obj->_id, $route); - }elseif(strpos($obj->url, 'agb') !== false) { + } elseif (strpos($obj->url, 'agb') !== false) { $route = new Zend_Controller_Router_Route( $obj->parameter->getArrayCopy()['target'], array_merge( @@ -489,7 +487,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap ) ); $router->addRoute((string)$obj->_id, $route); - }else{ + } else { $route = new Zend_Controller_Router_Route( $obj->url, array_merge(