Revision: 6471 http://care2002.svn.sourceforge.net/care2002/?rev=6471&view=rev Author: mizuko Date: 2010-06-30 11:35:34 +0000 (Wed, 30 Jun 2010)
Log Message: ----------- see #54 Modified Paths: -------------- care2x/branches/gettext/installer/db/sql/mysql_dump.sql care2x/branches/gettext/modules/pharmacy/apotheke-bestellbot-pass.php care2x/branches/gettext/modules/pharmacy/apotheke-datenbank-functions.php care2x/branches/gettext/modules/pharmacy/apotheke-pass.php care2x/branches/gettext/modules/pharmacy/yellowlist_pass.php care2x/branches/gettext/modules/products/products-archive-orderlist-showcontent.php care2x/branches/gettext/modules/products/products-archive.php care2x/branches/gettext/modules/products/products-bestell-hf.php care2x/branches/gettext/modules/products/products-bestellkatalog-edit.php care2x/branches/gettext/modules/products/products-orderlist-final.php care2x/branches/gettext/modules/products/select_dept.php care2x/branches/gettext/modules/supplier/supply-orderlist-final.php Added Paths: ----------- care2x/branches/gettext/modules/pharmacy/pharmacy.php Removed Paths: ------------- care2x/branches/gettext/modules/pharmacy/apotheke.php Modified: care2x/branches/gettext/installer/db/sql/mysql_dump.sql =================================================================== --- care2x/branches/gettext/installer/db/sql/mysql_dump.sql 2010-06-30 11:25:55 UTC (rev 6470) +++ care2x/branches/gettext/installer/db/sql/mysql_dump.sql 2010-06-30 11:35:34 UTC (rev 6471) @@ -4893,7 +4893,7 @@ INSERT INTO care_menu_main VALUES ('8', '40', 'OR', 'LDOR', '', 'main/op-docu.php', '1', '', '', 20030922232015, 00000000000000); INSERT INTO care_menu_main VALUES ('9', '45', 'Laboratories', '', 'LDLabs', 'modules/laboratory/labor.php', '1', '', '', 20030922232015, 00000000000000); INSERT INTO care_menu_main VALUES ('10', '50', 'Radiology', '', 'LDRadiology', 'modules/radiology/radiolog.php', '1', '', '', 20030922232015, 00000000000000); -INSERT INTO care_menu_main VALUES ('11', '55', 'Pharmacy', '', 'LDPharmacy', 'modules/pharmacy/apotheke.php', '1', '', '', 20030922232015, 00000000000000); +INSERT INTO care_menu_main VALUES ('11', '55', 'Pharmacy', '', 'LDPharmacy', 'modules/pharmacy/pharmacy.php', '1', '', '', 20030922232015, 00000000000000); INSERT INTO care_menu_main VALUES ('12', '60', 'Medical Depot', '', 'LDMedDepot', 'modules/medstock/medstock.php ', '1', '', '', 20030922232015, 00000000000000); INSERT INTO care_menu_main VALUES ('13', '65', 'Directory', '', 'LDDirectory', 'modules/phone_directory/phone.php', '1', '', '', 20030922232015, 00000000000000); INSERT INTO care_menu_main VALUES ('14', '70', 'Tech Support', '', 'LDTechSupport', 'modules/tech/technik.php', '1', '', '', 20030922232015, 00000000000000); @@ -4969,7 +4969,7 @@ INSERT INTO care_registry VALUES ('doctors', 'modules/doctors/doctors.php', 'modules/news/newscolumns.php', '', '', '', '', '', '', 00000000000000, '', 00000000000000); INSERT INTO care_registry VALUES ('nursing', 'modules/nursing/pflege.php', 'modules/news/newscolumns.php', '', '', '', '', '', '', 00000000000000, '', 00000000000000); INSERT INTO care_registry VALUES ('edp', 'modules/admin/edv.php', 'modules/news/newscolumns.php', '', '', '', '', '', '', 00000000000000, '', 00000000000000); -INSERT INTO care_registry VALUES ('pharmacy', 'modules/pharmacy/apotheke.php', 'modules/news/newscolumns.php', '', '', '', '', '', '', 00000000000000, '', 00000000000000); +INSERT INTO care_registry VALUES ('pharmacy', 'modules/pharmacy/pharmacy.php', 'modules/news/newscolumns.php', '', '', '', '', '', '', 00000000000000, '', 00000000000000); INSERT INTO care_registry VALUES ('pr', 'modules/news/start_page.php', 'modules/news/start_page.php', 'modules/news/headline-edit.php', 'modules/news/headline-read.php', 'modules/news/editor-pass.php', '', '', '', 00000000000000, '', 00000000000000); INSERT INTO care_registry VALUES ('cafe', 'modules/cafeteria/cafenews.php', 'modules/cafeteria/cafenews.php', 'modules/cafenews/cafenews-edit.php', 'modules/cafenews/cafenews-read.php', 'modules/cafenews/cafenews-edit-pass.php', '', '', '', 00000000000000, '', 00000000000000); INSERT INTO care_registry VALUES ('main_start', 'modules/news/start_page.php', 'modules/news/start_page.php', 'modules/news/headline-edit-select-art.php', 'modules/news/headline-read.php', '', '', '', '', 00000000000000, '', 00000000000000); Modified: care2x/branches/gettext/modules/pharmacy/apotheke-bestellbot-pass.php =================================================================== --- care2x/branches/gettext/modules/pharmacy/apotheke-bestellbot-pass.php 2010-06-30 11:25:55 UTC (rev 6470) +++ care2x/branches/gettext/modules/pharmacy/apotheke-bestellbot-pass.php 2010-06-30 11:35:34 UTC (rev 6471) @@ -21,8 +21,8 @@ if($user_origin=='pharmabot') $userck='ck_pharmabot_user'; else $userck='ck_apo_user'; -$breakfile='apotheke.php?sid='.$sid.'&lang='.$lang; -$fileforward="apotheke.php".URL_REDIRECT_APPEND."&stb=1&userck=$userck"; +$breakfile='pharmacy.php?sid='.$sid.'&lang='.$lang; +$fileforward="pharmacy.php".URL_REDIRECT_APPEND."&stb=1&userck=$userck"; $title=$LDPharmaOrderBot; $thisfile='apotheke-bestellbot-pass.php'; $lognote="$title ok"; Modified: care2x/branches/gettext/modules/pharmacy/apotheke-datenbank-functions.php =================================================================== --- care2x/branches/gettext/modules/pharmacy/apotheke-datenbank-functions.php 2010-06-30 11:25:55 UTC (rev 6470) +++ care2x/branches/gettext/modules/pharmacy/apotheke-datenbank-functions.php 2010-06-30 11:35:34 UTC (rev 6471) @@ -14,7 +14,7 @@ $local_user='ck_prod_db_user'; require_once($root_path.'include/helpers/inc_front_chain_lang.php'); -$breakfile='apotheke.php'.URL_APPEND; +$breakfile='pharmacy.php'.URL_APPEND; # Start Smarty templating here /** Modified: care2x/branches/gettext/modules/pharmacy/apotheke-pass.php =================================================================== --- care2x/branches/gettext/modules/pharmacy/apotheke-pass.php 2010-06-30 11:25:55 UTC (rev 6470) +++ care2x/branches/gettext/modules/pharmacy/apotheke-pass.php 2010-06-30 11:35:34 UTC (rev 6471) @@ -54,7 +54,7 @@ } $thisfile=basename(__FILE__); -$breakfile='apotheke.php'.URL_APPEND; +$breakfile='pharmacy.php'.URL_APPEND; $lognote="$LDPharmacy $title ok"; // reset all 2nd level lock cookies Deleted: care2x/branches/gettext/modules/pharmacy/apotheke.php =================================================================== --- care2x/branches/gettext/modules/pharmacy/apotheke.php 2010-06-30 11:25:55 UTC (rev 6470) +++ care2x/branches/gettext/modules/pharmacy/apotheke.php 2010-06-30 11:35:34 UTC (rev 6471) @@ -1,159 +0,0 @@ -<?php -error_reporting(E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR); -require('./roots.php'); -require($root_path.'include/helpers/inc_environment_global.php'); -/** -* CARE2X Integrated Hospital Information System Deployment 2.2 - 2006-07-10 -* GNU General Public License -* Copyright 2002,2003,2004,2005,2006 Elpidio Latorilla -* elpi...@care2x.org, -* -* See the file "copy_notice.txt" for the licence notice -*/ -define('LANG_FILE','products.php'); -define('NO_2LEVEL_CHK',1); -require_once($root_path.'include/helpers/inc_front_chain_lang.php'); -// Erase all cookies used for 2nd level script locking, all following scripst will be locked -// reset all 2nd level lock cookies -require($root_path.'include/helpers/inc_2level_reset.php'); - -if(!isset($_SESSION['sess_path_referer'])) $_SESSION['sess_path_referer'] = ""; -if(!isset($_SESSION['sess_user_origin'])) $_SESSION['sess_user_origin'] = ""; - -$breakfile=$root_path.'main/startframe.php'.URL_APPEND; - -$_SESSION['sess_path_referer']=$top_dir.basename(__FILE__); -$_SESSION['sess_user_origin']='pharma'; -require ($root_path.'include/core/class_access.php'); -$access = new Access($_SESSION['sess_login_userid'],$_SESSION['sess_login_pw']); -$hideOrder = 0; -if(ereg("_a_1_pharmadbadmin",$access->PermissionAreas())) - $hideOrder = 1; - - # Start Smarty templating here - /** - * LOAD Smarty - */ - - # Note: it is advisable to load this after the inc_front_chain_lang.php so - # that the smarty script can use the user configured template theme - - require_once($root_path.'gui/smarty_template/smarty_care.class.php'); - $smarty = new smarty_care('common'); - - # Create a helper smarty object without reinitializing the GUI - $smarty2 = new smarty_care('common', FALSE); - -# Added for the common header top block - - $smarty->assign('sToolbarTitle',$LDPharmacy); - - # Added for the common header top block - $smarty->assign('pbHelp',"javascript:gethelp('submenu1.php','$LDPharmacy')"); - - $smarty->assign('breakfile',$breakfile); - - # Window bar title - $smarty->assign('title',$LDPharmacy); - - # Add the bot onLoad code - - if(isset($stb) && $stb) $smarty->assign('sOnLoadJs','onLoad="startbot()"'); - - #Collect extra javascript code - - ob_start(); - -?> -<script language="javascript"> -<!-- -function closewin() { - location.href='startframe.php?sid=<?php echo "$sid&lang=$lang";?>'; -} -<?php - -if($stb) -echo ' -function startbot() { - pharmabotwin'.$sid.'=window.open("'.$root_path.'modules/products/products-bestellbot.php'.URL_REDIRECT_APPEND.'&cat=pharma&userck='.$userck.'","pharmabotwin'.$sid.'","width=200,height=180,menubar=no,resizable=yes,scrollbars=yes"); -} -'; - -?> -// --> -</script> - -<?php - -$sTemp = ob_get_contents(); -ob_end_clean(); - -// Append javascript to JavaScript block - - $smarty->append('JavaScript',$sTemp); - -// Prepare the submenu icons - - $aSubMenuIcon=array(createComIcon($root_path,'bestell.gif','0'), - createComIcon($root_path,'help_tree.gif','0'), - createComIcon($root_path,'templates.gif','0'), - createComIcon($root_path,'documents.gif','0'), - createComIcon($root_path,'storage.gif','0'), - createComIcon($root_path,'sitemap_animator.gif','0'), - createComIcon($root_path,'bubble.gif','0'), - createComIcon($root_path,'redlist.gif','0') - ); - -// Prepare the submenu item descriptions - -$aSubMenuText=array($LDPharmaOrderTxt, - $LDHow2OrderTxt, - $LDOrderCatTxt, - $LDOrderArchiveTxt, - $LDPharmaDbTxt, - $LDOrderBotActivateTxt, - $LDNewsTxt, - $LDRaporteFarmaciTxt - ); - -// Prepare the submenu item links indexed by their template tags - -$aSubMenuItem=array('LDPharmaOrder' => "<a href=\"apotheke-pass.php".URL_APPEND."&mode=order\">$LDPharmaOrder</a>", - 'LDHow2Order' => "<a href=\"javascript:gethelp('products.php','how2','','pharma')\">$LDHow2Order</a>", - 'LDOrderCat' => "<a href=\"apotheke-pass.php".URL_APPEND."&mode=catalog\">$LDOrderCat</a>", - 'LDOrderArchive' => "<a href=\"apotheke-pass.php".URL_APPEND."&mode=archive\">$LDOrderArchive</a>", - 'LDPharmaDb' => "<a href=\"apotheke-pass.php".URL_APPEND."&mode=dbank\">$LDPharmaDb</a>", - 'LDOrderBotActivate' => "<a href=\"apotheke-pass.php".URL_APPEND."&mode=bot&user_origin=pharmabot\" >$LDOrderBotActivate</a>", - 'LDNews' => "<a href=\"".$root_path."modules/news/newscolumns.php".URL_APPEND."&dept_nr=38\">$LDNews</a>", - 'LDRaporteFarmaci' => "<a href=\"".$root_path."modules/pharmacy/reports/index.php\">$LDRaporteFarmaci</a>" - ); - -# Create the submenu rows - -$iRunner = 0; - -while(list($x,$v)=each($aSubMenuItem)){ - if($hideOrder == 1 && $iRunner == 0) {$hideOrder = 0;continue;} - $sTemp=''; - ob_start(); - if($cfg['icons'] != 'no_icon') $smarty2->assign('sIconImg','<img '.$aSubMenuIcon[$iRunner].'>'); - $smarty2->assign('sSubMenuItem',$v); - $smarty2->assign('sSubMenuText',$aSubMenuText[$iRunner]); - $smarty2->display('common/submenu_row.tpl'); - $sTemp = ob_get_contents(); - ob_end_clean(); - $iRunner++; - $smarty->assign($x,$sTemp); -} - -# Assign the submenu to the mainframe center block - - $smarty->assign('sMainBlockIncludeFile','pharmacy/submenu_pharmacy.tpl'); - - /** - * show Template - */ - - $smarty->display('common/mainframe.tpl'); - -?> Copied: care2x/branches/gettext/modules/pharmacy/pharmacy.php (from rev 6440, care2x/branches/gettext/modules/pharmacy/apotheke.php) =================================================================== --- care2x/branches/gettext/modules/pharmacy/pharmacy.php (rev 0) +++ care2x/branches/gettext/modules/pharmacy/pharmacy.php 2010-06-30 11:35:34 UTC (rev 6471) @@ -0,0 +1,159 @@ +<?php +error_reporting(E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR); +require('./roots.php'); +require($root_path.'include/helpers/inc_environment_global.php'); +/** +* CARE2X Integrated Hospital Information System Deployment 2.2 - 2006-07-10 +* GNU General Public License +* Copyright 2002,2003,2004,2005,2006 Elpidio Latorilla +* elpi...@care2x.org, +* +* See the file "copy_notice.txt" for the licence notice +*/ +define('LANG_FILE','products.php'); +define('NO_2LEVEL_CHK',1); +require_once($root_path.'include/helpers/inc_front_chain_lang.php'); +// Erase all cookies used for 2nd level script locking, all following scripst will be locked +// reset all 2nd level lock cookies +require($root_path.'include/helpers/inc_2level_reset.php'); + +if(!isset($_SESSION['sess_path_referer'])) $_SESSION['sess_path_referer'] = ""; +if(!isset($_SESSION['sess_user_origin'])) $_SESSION['sess_user_origin'] = ""; + +$breakfile=$root_path.'main/startframe.php'.URL_APPEND; + +$_SESSION['sess_path_referer']=$top_dir.basename(__FILE__); +$_SESSION['sess_user_origin']='pharma'; +require ($root_path.'include/core/class_access.php'); +$access = new Access($_SESSION['sess_login_userid'],$_SESSION['sess_login_pw']); +$hideOrder = 0; +if(ereg("_a_1_pharmadbadmin",$access->PermissionAreas())) + $hideOrder = 1; + + # Start Smarty templating here + /** + * LOAD Smarty + */ + + # Note: it is advisable to load this after the inc_front_chain_lang.php so + # that the smarty script can use the user configured template theme + + require_once($root_path.'gui/smarty_template/smarty_care.class.php'); + $smarty = new smarty_care('common'); + + # Create a helper smarty object without reinitializing the GUI + $smarty2 = new smarty_care('common', FALSE); + +# Added for the common header top block + + $smarty->assign('sToolbarTitle',$LDPharmacy); + + # Added for the common header top block + $smarty->assign('pbHelp',"javascript:gethelp('submenu1.php','$LDPharmacy')"); + + $smarty->assign('breakfile',$breakfile); + + # Window bar title + $smarty->assign('title',$LDPharmacy); + + # Add the bot onLoad code + + if(isset($stb) && $stb) $smarty->assign('sOnLoadJs','onLoad="startbot()"'); + + #Collect extra javascript code + + ob_start(); + +?> +<script language="javascript"> +<!-- +function closewin() { + location.href='startframe.php?sid=<?php echo "$sid&lang=$lang";?>'; +} +<?php + +if($stb) +echo ' +function startbot() { + pharmabotwin'.$sid.'=window.open("'.$root_path.'modules/products/products-bestellbot.php'.URL_REDIRECT_APPEND.'&cat=pharma&userck='.$userck.'","pharmabotwin'.$sid.'","width=200,height=180,menubar=no,resizable=yes,scrollbars=yes"); +} +'; + +?> +// --> +</script> + +<?php + +$sTemp = ob_get_contents(); +ob_end_clean(); + +// Append javascript to JavaScript block + + $smarty->append('JavaScript',$sTemp); + +// Prepare the submenu icons + + $aSubMenuIcon=array(createComIcon($root_path,'bestell.gif','0'), + createComIcon($root_path,'help_tree.gif','0'), + createComIcon($root_path,'templates.gif','0'), + createComIcon($root_path,'documents.gif','0'), + createComIcon($root_path,'storage.gif','0'), + createComIcon($root_path,'sitemap_animator.gif','0'), + createComIcon($root_path,'bubble.gif','0'), + createComIcon($root_path,'redlist.gif','0') + ); + +// Prepare the submenu item descriptions + +$aSubMenuText=array($LDPharmaOrderTxt, + $LDHow2OrderTxt, + $LDOrderCatTxt, + $LDOrderArchiveTxt, + $LDPharmaDbTxt, + $LDOrderBotActivateTxt, + $LDNewsTxt, + $LDRaporteFarmaciTxt + ); + +// Prepare the submenu item links indexed by their template tags + +$aSubMenuItem=array('LDPharmaOrder' => "<a href=\"apotheke-pass.php".URL_APPEND."&mode=order\">$LDPharmaOrder</a>", + 'LDHow2Order' => "<a href=\"javascript:gethelp('products.php','how2','','pharma')\">$LDHow2Order</a>", + 'LDOrderCat' => "<a href=\"apotheke-pass.php".URL_APPEND."&mode=catalog\">$LDOrderCat</a>", + 'LDOrderArchive' => "<a href=\"apotheke-pass.php".URL_APPEND."&mode=archive\">$LDOrderArchive</a>", + 'LDPharmaDb' => "<a href=\"apotheke-pass.php".URL_APPEND."&mode=dbank\">$LDPharmaDb</a>", + 'LDOrderBotActivate' => "<a href=\"apotheke-pass.php".URL_APPEND."&mode=bot&user_origin=pharmabot\" >$LDOrderBotActivate</a>", + 'LDNews' => "<a href=\"".$root_path."modules/news/newscolumns.php".URL_APPEND."&dept_nr=38\">$LDNews</a>", + 'LDRaporteFarmaci' => "<a href=\"".$root_path."modules/pharmacy/reports/index.php\">$LDRaporteFarmaci</a>" + ); + +# Create the submenu rows + +$iRunner = 0; + +while(list($x,$v)=each($aSubMenuItem)){ + if($hideOrder == 1 && $iRunner == 0) {$hideOrder = 0;continue;} + $sTemp=''; + ob_start(); + if($cfg['icons'] != 'no_icon') $smarty2->assign('sIconImg','<img '.$aSubMenuIcon[$iRunner].'>'); + $smarty2->assign('sSubMenuItem',$v); + $smarty2->assign('sSubMenuText',$aSubMenuText[$iRunner]); + $smarty2->display('common/submenu_row.tpl'); + $sTemp = ob_get_contents(); + ob_end_clean(); + $iRunner++; + $smarty->assign($x,$sTemp); +} + +# Assign the submenu to the mainframe center block + + $smarty->assign('sMainBlockIncludeFile','pharmacy/submenu_pharmacy.tpl'); + + /** + * show Template + */ + + $smarty->display('common/mainframe.tpl'); + +?> Modified: care2x/branches/gettext/modules/pharmacy/yellowlist_pass.php =================================================================== --- care2x/branches/gettext/modules/pharmacy/yellowlist_pass.php 2010-06-30 11:25:55 UTC (rev 6470) +++ care2x/branches/gettext/modules/pharmacy/yellowlist_pass.php 2010-06-30 11:35:34 UTC (rev 6471) @@ -21,7 +21,7 @@ $fileforward='http://www.gelbe-liste.de/index.htm?'; $thisfile=basename(__FILE__); -$breakfile='apotheke.php'.URL_APPEND; +$breakfile='pharmacy.php'.URL_APPEND; $lognote="$LDYellowList $title ok"; // reset all 2nd level lock cookies Modified: care2x/branches/gettext/modules/products/products-archive-orderlist-showcontent.php =================================================================== --- care2x/branches/gettext/modules/products/products-archive-orderlist-showcontent.php 2010-06-30 11:25:55 UTC (rev 6470) +++ care2x/branches/gettext/modules/products/products-archive-orderlist-showcontent.php 2010-06-30 11:35:34 UTC (rev 6471) @@ -30,7 +30,7 @@ $title=$LDPharmacy; $dbtable='care_pharma_orderlist'; $dbtableSub='care_pharma_orderlist_sub'; - $breakfile=$root_path.'modules/pharmacy/apotheke.php?sid='.$sid.'&lang='.$lang; + $breakfile=$root_path.'modules/pharmacy/pharmacy.php?sid='.$sid.'&lang='.$lang; break; case 'medstock': $title=$LDMedDepot; Modified: care2x/branches/gettext/modules/products/products-archive.php =================================================================== --- care2x/branches/gettext/modules/products/products-archive.php 2010-06-30 11:25:55 UTC (rev 6470) +++ care2x/branches/gettext/modules/products/products-archive.php 2010-06-30 11:35:34 UTC (rev 6471) @@ -25,7 +25,7 @@ case 'pharma': $title="$LDPharmacy $LDOrderArchive"; $dbtable='care_pharma_orderlist'; - $breakfile=$root_path.'modules/pharmacy/apotheke.php'.URL_APPEND; + $breakfile=$root_path.'modules/pharmacy/pharmacy.php'.URL_APPEND; break; case 'medstock': $title="$LDMedDepot $LDOrderArchive"; Modified: care2x/branches/gettext/modules/products/products-bestell-hf.php =================================================================== --- care2x/branches/gettext/modules/products/products-bestell-hf.php 2010-06-30 11:25:55 UTC (rev 6470) +++ care2x/branches/gettext/modules/products/products-bestell-hf.php 2010-06-30 11:35:34 UTC (rev 6471) @@ -15,7 +15,7 @@ require_once($root_path.'include/helpers/inc_front_chain_lang.php'); switch($cat) { - case "pharma": $breakfile=$root_path."modules/pharmacy/apotheke.php".URL_APPEND; + case "pharma": $breakfile=$root_path."modules/pharmacy/pharmacy.php".URL_APPEND; break; case "medstock": $breakfile=$root_path."modules/medstock/medstock.php ".URL_APPEND; break; Modified: care2x/branches/gettext/modules/products/products-bestellkatalog-edit.php =================================================================== --- care2x/branches/gettext/modules/products/products-bestellkatalog-edit.php 2010-06-30 11:25:55 UTC (rev 6470) +++ care2x/branches/gettext/modules/products/products-bestellkatalog-edit.php 2010-06-30 11:35:34 UTC (rev 6471) @@ -38,7 +38,7 @@ switch($cat) { case 'pharma': $title=$LDPharmacy; - $breakfile=$root_path."modules/pharmacy/apotheke.php".URL_APPEND; + $breakfile=$root_path."modules/pharmacy/pharmacy.php".URL_APPEND; break; case 'medstock':$title=$LDMedDepot; $breakfile=$root_path."modules/medstock/medstock.php ".URL_APPEND; Modified: care2x/branches/gettext/modules/products/products-orderlist-final.php =================================================================== --- care2x/branches/gettext/modules/products/products-orderlist-final.php 2010-06-30 11:25:55 UTC (rev 6470) +++ care2x/branches/gettext/modules/products/products-orderlist-final.php 2010-06-30 11:35:34 UTC (rev 6471) @@ -17,7 +17,7 @@ if($cat=='pharma') { $dbtable='care_pharma_orderlist'; $title=$LDPharmacy; - $breakfile='modules/pharmacy/apotheke.php'; + $breakfile='modules/pharmacy/pharmacy.php'; }else{ $dbtable='care_med_orderlist'; $title=$LDMedDepot; Modified: care2x/branches/gettext/modules/products/select_dept.php =================================================================== --- care2x/branches/gettext/modules/products/select_dept.php 2010-06-30 11:25:55 UTC (rev 6470) +++ care2x/branches/gettext/modules/products/select_dept.php 2010-06-30 11:35:34 UTC (rev 6471) @@ -19,7 +19,7 @@ switch($_SESSION['sess_user_origin']) { case 'pharma': - $breakfile=$root_path.'modules/pharmacy/apotheke.php'.URL_APPEND; + $breakfile=$root_path.'modules/pharmacy/pharmacy.php'.URL_APPEND; break; case 'meddepot': Modified: care2x/branches/gettext/modules/supplier/supply-orderlist-final.php =================================================================== --- care2x/branches/gettext/modules/supplier/supply-orderlist-final.php 2010-06-30 11:25:55 UTC (rev 6470) +++ care2x/branches/gettext/modules/supplier/supply-orderlist-final.php 2010-06-30 11:35:34 UTC (rev 6471) @@ -26,7 +26,7 @@ if($cat=='pharma') { $dbtable='care_pharma_orderlist'; $title=$LDPharmacy; - $breakfile=$root_path.'modules/pharmacy/apotheke.php'; + $breakfile=$root_path.'modules/pharmacy/pharmacy.php'; }else{ $dbtable='care_med_orderlist'; $title=$LDMedDepot; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first _______________________________________________ Care2002-developers mailing list Care2002-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/care2002-developers