Revision: 6429 http://care2002.svn.sourceforge.net/care2002/?rev=6429&view=rev Author: mizuko Date: 2010-06-30 08:49:13 +0000 (Wed, 30 Jun 2010)
Log Message: ----------- see #54 Modified Paths: -------------- care2x/branches/gettext/installer/db/sql/mysql_dump.sql care2x/branches/gettext/modules/med_depot/medlager-bestellbot-pass.php care2x/branches/gettext/modules/med_depot/medlager-datenbank-functions.php care2x/branches/gettext/modules/med_depot/medlager-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/supplier.php care2x/branches/gettext/modules/supplier/supply-hf.php care2x/branches/gettext/modules/supplier/supply-orderlist-final.php Added Paths: ----------- care2x/branches/gettext/modules/med_depot/medstock.php Removed Paths: ------------- care2x/branches/gettext/modules/med_depot/medlager.php Modified: care2x/branches/gettext/installer/db/sql/mysql_dump.sql =================================================================== --- care2x/branches/gettext/installer/db/sql/mysql_dump.sql 2010-06-30 08:43:47 UTC (rev 6428) +++ care2x/branches/gettext/installer/db/sql/mysql_dump.sql 2010-06-30 08:49:13 UTC (rev 6429) @@ -4894,7 +4894,7 @@ 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 ('12', '60', 'Medical Depot', '', 'LDMedDepot', 'modules/med_depot/medlager.php', '1', '', '', 20030922232015, 00000000000000); +INSERT INTO care_menu_main VALUES ('12', '60', 'Medical Depot', '', 'LDMedDepot', 'modules/med_depot/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); INSERT INTO care_menu_main VALUES ('15', '72', 'System Admin', '', 'LDEDP', 'modules/system_admin/edv.php', '1', '', '', 20030922232015, 00000000000000); Modified: care2x/branches/gettext/modules/med_depot/medlager-bestellbot-pass.php =================================================================== --- care2x/branches/gettext/modules/med_depot/medlager-bestellbot-pass.php 2010-06-30 08:43:47 UTC (rev 6428) +++ care2x/branches/gettext/modules/med_depot/medlager-bestellbot-pass.php 2010-06-30 08:49:13 UTC (rev 6429) @@ -18,8 +18,8 @@ //gjergji //$allowedarea=&$allow_area['depot']; $userck="ck_medlager_user"; -$breakfile="medlager.php".URL_APPEND."&userck=$userck"; -$fileforward="medlager.php".URL_REDIRECT_APPEND."&userck=$userck&stb=1"; +$breakfile="medstock.php ".URL_APPEND."&userck=$userck"; +$fileforward="medstock.php ".URL_REDIRECT_APPEND."&userck=$userck&stb=1"; $title=$LDMediBotActivate; $thisfile="medlager-bestellbot-pass.php"; $lognote="$title ok"; Modified: care2x/branches/gettext/modules/med_depot/medlager-datenbank-functions.php =================================================================== --- care2x/branches/gettext/modules/med_depot/medlager-datenbank-functions.php 2010-06-30 08:43:47 UTC (rev 6428) +++ care2x/branches/gettext/modules/med_depot/medlager-datenbank-functions.php 2010-06-30 08:49:13 UTC (rev 6429) @@ -13,7 +13,7 @@ define('LANG_FILE','products.php'); $local_user='ck_prod_db_user'; require_once($root_path.'include/helpers/inc_front_chain_lang.php'); -$breakfile='medlager.php'.URL_APPEND; +$breakfile='medstock.php '.URL_APPEND; ?> <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN" "html.dtd"> <?php html_rtl($lang); ?> Modified: care2x/branches/gettext/modules/med_depot/medlager-pass.php =================================================================== --- care2x/branches/gettext/modules/med_depot/medlager-pass.php 2010-06-30 08:43:47 UTC (rev 6428) +++ care2x/branches/gettext/modules/med_depot/medlager-pass.php 2010-06-30 08:49:13 UTC (rev 6429) @@ -67,7 +67,7 @@ } $thisfile=basename(__FILE__); -$breakfile='medlager.php'.URL_APPEND; +$breakfile='medstock.php '.URL_APPEND; $lognote="$LDMedDepot $title ok"; Deleted: care2x/branches/gettext/modules/med_depot/medlager.php =================================================================== --- care2x/branches/gettext/modules/med_depot/medlager.php 2010-06-30 08:43:47 UTC (rev 6428) +++ care2x/branches/gettext/modules/med_depot/medlager.php 2010-06-30 08:49:13 UTC (rev 6429) @@ -1,143 +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.1 - 2004-10-02 -* GNU General Public License -* Copyright 2002,2003,2004,2005 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'); - -$breakfile=$root_path.'main/startframe.php'.URL_APPEND; -// reset all 2nd level lock cookies -require($root_path.'include/helpers/inc_2level_reset.php'); -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_meddepotdbadmin",$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',$LDMedDepot); - - # Added for the common header top block - $smarty->assign('pbHelp',"javascript:gethelp('submenu1.php','$LDMedDepot')"); - - $smarty->assign('breakfile',$breakfile); - - # Window bar title - $smarty->assign('title',$LDMedDepot); - - # Add the bot onLoad code - - if(isset($stb) && $stb) $smarty->assign('sOnLoadJs','onLoad="startbot()"'); - - ob_start(); -?> - -<script language="javascript"> -<!-- -<?php - -if($stb) -echo ' -function startbot() { - medibotwin'.$sid.'=window.open("'.$root_path.'modules/products/products-bestellbot.php'.URL_REDIRECT_APPEND.'&cat=medlager&userck='.$userck.'","medibotwin'.$sid.'","width=200,height=180,menubar=no,resizable=yes,scrollbars=yes"); -} -'; -?> -// --> -</script> - -<?php - - $sTemp = ob_get_contents(); -ob_end_clean(); -$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,'storage.gif','0'), - createComIcon($root_path,'storage.gif','0') - ); - -# Prepare the submenu item descriptions - -$aSubMenuText=array($LDPharmaOrderTxt, - $LDHow2OrderTxt, - $LDOrderCatTxt, - $LDOrderArchiveTxt, - $LDPharmaDbTxt, - $LDOrderBotActivateTxt, - $LDSupplierTxt, - $LDSupplyTxt - ); - -# Prepare the submenu item links indexed by their template tags - -$aSubMenuItem=array('LDPharmaOrder' => "<a href=\"medlager-pass.php".URL_APPEND."&mode=order\">$LDPharmaOrder</a>", - 'LDHow2Order' => "<a href=\"javascript:gethelp('products.php','how2','','meddepot')\">$LDHow2Order</a>", - 'LDOrderCat' => "<a href=\"medlager-pass.php".URL_APPEND."&mode=catalog\">$LDOrderCat</a>", - 'LDOrderArchive' => "<a href=\"medlager-pass.php".URL_APPEND."&mode=archive\">$LDOrderArchive</a>", - 'LDPharmaDb' => "<a href=\"medlager-pass.php".URL_APPEND."&mode=dbank\">$LDPharmaDb</a>", - 'LDOrderBotActivate' => "<a href=\"medlager-bestellbot-pass.php".URL_APPEND."\" >$LDMediBotActivate</a>", - 'LDSupplier' => "<a href=\"medlager-pass.php".URL_APPEND."&mode=supplier\">$LDSupplier</a>", - 'LDSupply' => "<a href=\"medlager-pass.php".URL_APPEND."&mode=supply\">$LDSupply</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','med_depot/submenu_medlager.tpl'); - - /** - * show Template - */ - - $smarty->display('common/mainframe.tpl'); -?> Copied: care2x/branches/gettext/modules/med_depot/medstock.php (from rev 6405, care2x/branches/gettext/modules/med_depot/medlager.php) =================================================================== --- care2x/branches/gettext/modules/med_depot/medstock.php (rev 0) +++ care2x/branches/gettext/modules/med_depot/medstock.php 2010-06-30 08:49:13 UTC (rev 6429) @@ -0,0 +1,143 @@ +<?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.1 - 2004-10-02 +* GNU General Public License +* Copyright 2002,2003,2004,2005 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'); + +$breakfile=$root_path.'main/startframe.php'.URL_APPEND; +// reset all 2nd level lock cookies +require($root_path.'include/helpers/inc_2level_reset.php'); +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_meddepotdbadmin",$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',$LDMedDepot); + + # Added for the common header top block + $smarty->assign('pbHelp',"javascript:gethelp('submenu1.php','$LDMedDepot')"); + + $smarty->assign('breakfile',$breakfile); + + # Window bar title + $smarty->assign('title',$LDMedDepot); + + # Add the bot onLoad code + + if(isset($stb) && $stb) $smarty->assign('sOnLoadJs','onLoad="startbot()"'); + + ob_start(); +?> + +<script language="javascript"> +<!-- +<?php + +if($stb) +echo ' +function startbot() { + medibotwin'.$sid.'=window.open("'.$root_path.'modules/products/products-bestellbot.php'.URL_REDIRECT_APPEND.'&cat=medlager&userck='.$userck.'","medibotwin'.$sid.'","width=200,height=180,menubar=no,resizable=yes,scrollbars=yes"); +} +'; +?> +// --> +</script> + +<?php + + $sTemp = ob_get_contents(); +ob_end_clean(); +$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,'storage.gif','0'), + createComIcon($root_path,'storage.gif','0') + ); + +# Prepare the submenu item descriptions + +$aSubMenuText=array($LDPharmaOrderTxt, + $LDHow2OrderTxt, + $LDOrderCatTxt, + $LDOrderArchiveTxt, + $LDPharmaDbTxt, + $LDOrderBotActivateTxt, + $LDSupplierTxt, + $LDSupplyTxt + ); + +# Prepare the submenu item links indexed by their template tags + +$aSubMenuItem=array('LDPharmaOrder' => "<a href=\"medlager-pass.php".URL_APPEND."&mode=order\">$LDPharmaOrder</a>", + 'LDHow2Order' => "<a href=\"javascript:gethelp('products.php','how2','','meddepot')\">$LDHow2Order</a>", + 'LDOrderCat' => "<a href=\"medlager-pass.php".URL_APPEND."&mode=catalog\">$LDOrderCat</a>", + 'LDOrderArchive' => "<a href=\"medlager-pass.php".URL_APPEND."&mode=archive\">$LDOrderArchive</a>", + 'LDPharmaDb' => "<a href=\"medlager-pass.php".URL_APPEND."&mode=dbank\">$LDPharmaDb</a>", + 'LDOrderBotActivate' => "<a href=\"medlager-bestellbot-pass.php".URL_APPEND."\" >$LDMediBotActivate</a>", + 'LDSupplier' => "<a href=\"medlager-pass.php".URL_APPEND."&mode=supplier\">$LDSupplier</a>", + 'LDSupply' => "<a href=\"medlager-pass.php".URL_APPEND."&mode=supply\">$LDSupply</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','med_depot/submenu_medlager.tpl'); + + /** + * show Template + */ + + $smarty->display('common/mainframe.tpl'); +?> Modified: care2x/branches/gettext/modules/products/products-archive-orderlist-showcontent.php =================================================================== --- care2x/branches/gettext/modules/products/products-archive-orderlist-showcontent.php 2010-06-30 08:43:47 UTC (rev 6428) +++ care2x/branches/gettext/modules/products/products-archive-orderlist-showcontent.php 2010-06-30 08:49:13 UTC (rev 6429) @@ -36,7 +36,7 @@ $title=$LDMedDepot; $dbtable='care_med_orderlist'; $dbtableSub='care_med_orderlist_sub'; - $breakfile=$root_path.'modules/med_depot/medlager.php?sid='.$sid.'&lang='.$lang; + $breakfile=$root_path.'modules/med_depot/medstock.php ?sid='.$sid.'&lang='.$lang; break; default: {header('Location:'.$root_path.'language/'.$lang.'/lang_'.$lang.'_invalid-access-warning.php'); exit;}; } Modified: care2x/branches/gettext/modules/products/products-archive.php =================================================================== --- care2x/branches/gettext/modules/products/products-archive.php 2010-06-30 08:43:47 UTC (rev 6428) +++ care2x/branches/gettext/modules/products/products-archive.php 2010-06-30 08:49:13 UTC (rev 6429) @@ -30,7 +30,7 @@ case 'medlager': $title="$LDMedDepot $LDOrderArchive"; $dbtable='care_med_orderlist'; - $breakfile=$root_path.'modules/med_depot/medlager.php'.URL_APPEND; + $breakfile=$root_path.'modules/med_depot/medstock.php '.URL_APPEND; break; default: {header('Location:'.$root_path.'language/'.$lang.'/lang_'.$lang.'_invalid-access-warning.php'); exit;}; } Modified: care2x/branches/gettext/modules/products/products-bestell-hf.php =================================================================== --- care2x/branches/gettext/modules/products/products-bestell-hf.php 2010-06-30 08:43:47 UTC (rev 6428) +++ care2x/branches/gettext/modules/products/products-bestell-hf.php 2010-06-30 08:49:13 UTC (rev 6429) @@ -17,7 +17,7 @@ { case "pharma": $breakfile=$root_path."modules/pharmacy/apotheke.php".URL_APPEND; break; - case "medlager": $breakfile=$root_path."modules/med_depot/medlager.php".URL_APPEND; + case "medlager": $breakfile=$root_path."modules/med_depot/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 08:43:47 UTC (rev 6428) +++ care2x/branches/gettext/modules/products/products-bestellkatalog-edit.php 2010-06-30 08:49:13 UTC (rev 6429) @@ -41,7 +41,7 @@ $breakfile=$root_path."modules/pharmacy/apotheke.php".URL_APPEND; break; case 'medlager':$title=$LDMedDepot; - $breakfile=$root_path."modules/med_depot/medlager.php".URL_APPEND; + $breakfile=$root_path."modules/med_depot/medstock.php ".URL_APPEND; break; default: $invalid=1; } Modified: care2x/branches/gettext/modules/products/products-orderlist-final.php =================================================================== --- care2x/branches/gettext/modules/products/products-orderlist-final.php 2010-06-30 08:43:47 UTC (rev 6428) +++ care2x/branches/gettext/modules/products/products-orderlist-final.php 2010-06-30 08:49:13 UTC (rev 6429) @@ -21,7 +21,7 @@ }else{ $dbtable='care_med_orderlist'; $title=$LDMedDepot; - $breakfile='modules/med_depot/medlager.php'; + $breakfile='modules/med_depot/medstock.php '; } $thisfile=basename(__FILE__); Modified: care2x/branches/gettext/modules/products/select_dept.php =================================================================== --- care2x/branches/gettext/modules/products/select_dept.php 2010-06-30 08:43:47 UTC (rev 6428) +++ care2x/branches/gettext/modules/products/select_dept.php 2010-06-30 08:49:13 UTC (rev 6429) @@ -23,7 +23,7 @@ break; case 'meddepot': - $breakfile=$root_path.'modules/med_depot/medlager.php'.URL_APPEND; + $breakfile=$root_path.'modules/med_depot/medstock.php '.URL_APPEND; break; } Modified: care2x/branches/gettext/modules/supplier/supplier.php =================================================================== --- care2x/branches/gettext/modules/supplier/supplier.php 2010-06-30 08:43:47 UTC (rev 6428) +++ care2x/branches/gettext/modules/supplier/supplier.php 2010-06-30 08:49:13 UTC (rev 6429) @@ -5,7 +5,7 @@ define('LANG_FILE','products.php'); $local_user='ck_supplier_db_user'; -$breakfile=$root_path.'modules/med_depot/medlager.php'.URL_APPEND; +$breakfile=$root_path.'modules/med_depot/medstock.php '.URL_APPEND; require_once($root_path.'include/helpers/inc_front_chain_lang.php'); # Create products object require_once($root_path.'modules/supplier/model/class_supplier.php'); Modified: care2x/branches/gettext/modules/supplier/supply-hf.php =================================================================== --- care2x/branches/gettext/modules/supplier/supply-hf.php 2010-06-30 08:43:47 UTC (rev 6428) +++ care2x/branches/gettext/modules/supplier/supply-hf.php 2010-06-30 08:49:13 UTC (rev 6429) @@ -13,7 +13,7 @@ define('LANG_FILE','products.php'); $local_user='ck_supply_db_user'; require_once($root_path.'include/helpers/inc_front_chain_lang.php'); -$breakfile=$root_path.'modules/med_depot/medlager.php'.URL_APPEND; +$breakfile=$root_path.'modules/med_depot/medstock.php '.URL_APPEND; /** Modified: care2x/branches/gettext/modules/supplier/supply-orderlist-final.php =================================================================== --- care2x/branches/gettext/modules/supplier/supply-orderlist-final.php 2010-06-30 08:43:47 UTC (rev 6428) +++ care2x/branches/gettext/modules/supplier/supply-orderlist-final.php 2010-06-30 08:49:13 UTC (rev 6429) @@ -30,7 +30,7 @@ }else{ $dbtable='care_med_orderlist'; $title=$LDMedDepot; - $breakfile=$root_path.'modules/med_depot/medlager.php'; + $breakfile=$root_path.'modules/med_depot/medstock.php '; } $thisfile=basename(__FILE__); 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