Revision: 6489
          http://care2002.svn.sourceforge.net/care2002/?rev=6489&view=rev
Author:   mizuko
Date:     2010-06-30 12:26:49 +0000 (Wed, 30 Jun 2010)

Log Message:
-----------
see #54

Modified Paths:
--------------
    care2x/branches/gettext/modules/pharmacy/pharmacy.php

Added Paths:
-----------
    care2x/branches/gettext/modules/pharmacy/pharmacy-pass.php

Removed Paths:
-------------
    care2x/branches/gettext/modules/pharmacy/apotheke-pass.php

Deleted: care2x/branches/gettext/modules/pharmacy/apotheke-pass.php
===================================================================
--- care2x/branches/gettext/modules/pharmacy/apotheke-pass.php  2010-06-30 
12:25:28 UTC (rev 6488)
+++ care2x/branches/gettext/modules/pharmacy/apotheke-pass.php  2010-06-30 
12:26:49 UTC (rev 6489)
@@ -1,96 +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','stdpass.php');
-define('NO_2LEVEL_CHK',1);
-require_once($root_path.'include/helpers/inc_front_chain_lang.php');
-
-require_once($root_path.'global_conf/areas_allow.php');
-
-//$allowedarea=&$allow_area['pharma'];
-$append=URL_REDIRECT_APPEND.'&cat=pharma&userck=';
-switch($mode) {
-       case "order":   $title=$LDPharmaOrder;
-                                               $allowedarea[] = 
'_a_3_pharmaorder';
-                                               $src="orderpass";
-                                               $mode="order";
-                                               $userck="ck_prod_order_user";
-                                               
$fileforward=$root_path."modules/products/products-order.php".$append.$userck."&from=".$src;
-                                               break;
-       case "archive":$title=$LDOrderArchive;
-                                               $allowedarea[] = 
'_a_1_pharmadbadmin';  
-                                               $src="archivepass";
-                                               $userck="ck_prod_arch_user";
-                                               
$fileforward=$root_path."modules/products/products-archive.php".$append.$userck."&from=".$src;
-                                               break;
-       case "dbank":  $title=$LDPharmaDb;
-                                               $allowedarea[] = 
'_a_1_pharmadbadmin';  
-                                               $src="dbankpass";
-                                               $userck="ck_prod_db_user";
-                                               
$fileforward="pharmacy-database-functions.php".$append.$userck."&from=".$src;
-                                               break;
-       case "catalog":  $title=$LDOrderCat;
-                                               $allowedarea[] = 
'_a_1_pharmadbadmin';  
-                                               $src="catalogpass";
-                                               $userck="ck_prod_order_user";
-                                               
$fileforward=$root_path."modules/products/products-ordercatalog-edit.php".$append.$userck."&target=catalog&from=".$src;
-                                               break;
-       case "bot":  $title=$LDPharmaOrderBot;
-                                               $allowedarea[] = 
'_a_1_pharmadbadmin';  
-                                               $src="medibotpass";
-                                               $userck="ck_prod_bot_user";
-                                               
$fileforward=$root_path."modules/pharmacy/pharmacy-orderbot-pass.php".URL_APPEND."&mode=bot&user_origin=pharmabot";
-                                               break;
-       default:        
{header("Location:".$root_path."language/".$lang."/lang_".$lang."_invalid-access-warning.php");
 exit;}; 
-}
-
-$thisfile=basename(__FILE__);
-$breakfile='pharmacy.php'.URL_APPEND;
-$lognote="$LDPharmacy $title ok";
-
-// reset all 2nd level lock cookies
-require($root_path.'include/helpers/inc_2level_reset.php'); 
-setcookie('ck_2level_sid'.$sid,'',0,'/');
-
-require($root_path.'include/helpers/inc_passcheck_internchk.php');
-if ($pass=='check') 
-       include($root_path.'include/helpers/inc_passcheck.php');
-
-$errbuf="$LDPharmacy $title";
-$minimal=1;
-require($root_path.'include/helpers/inc_passcheck_head.php');
-?>
-
-<BODY  <?php if (!$nofocus) echo 
'onLoad="document.passwindow.userid.focus()"'; echo  ' 
bgcolor='.$cfg['body_bgcolor']; 
- if (!$cfg['dhtml']){ echo ' link='.$cfg['body_txtcolor'].' 
alink='.$cfg['body_alink'].' vlink='.$cfg['body_txtcolor']; } 
-?>>
-
-<p>
-<FONT SIZE=-1  FACE="Arial">
-<P>
-<img src="../../gui/img/common/default/lampboard.gif" border=0 align="middle">
-<FONT  COLOR="<?php echo $cfg[top_txtcolor] ?>"  SIZE=5  FACE="verdana"> 
<b><?php echo "$LDPharmacy :: $title" ?></b></font>
-<p>
-<table width=100% border=0 cellpadding="0" cellspacing="0"> 
-
-<?php require($root_path.'include/helpers/inc_passcheck_mask.php') ?>  
-
-<?php
-require($root_path.'include/helpers/inc_load_copyrite.php');
-?>
-
-
-</FONT>
-
-
-</BODY>
-</HTML>

Copied: care2x/branches/gettext/modules/pharmacy/pharmacy-pass.php (from rev 
6488, care2x/branches/gettext/modules/pharmacy/apotheke-pass.php)
===================================================================
--- care2x/branches/gettext/modules/pharmacy/pharmacy-pass.php                  
        (rev 0)
+++ care2x/branches/gettext/modules/pharmacy/pharmacy-pass.php  2010-06-30 
12:26:49 UTC (rev 6489)
@@ -0,0 +1,96 @@
+<?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','stdpass.php');
+define('NO_2LEVEL_CHK',1);
+require_once($root_path.'include/helpers/inc_front_chain_lang.php');
+
+require_once($root_path.'global_conf/areas_allow.php');
+
+//$allowedarea=&$allow_area['pharma'];
+$append=URL_REDIRECT_APPEND.'&cat=pharma&userck=';
+switch($mode) {
+       case "order":   $title=$LDPharmaOrder;
+                                               $allowedarea[] = 
'_a_3_pharmaorder';
+                                               $src="orderpass";
+                                               $mode="order";
+                                               $userck="ck_prod_order_user";
+                                               
$fileforward=$root_path."modules/products/products-order.php".$append.$userck."&from=".$src;
+                                               break;
+       case "archive":$title=$LDOrderArchive;
+                                               $allowedarea[] = 
'_a_1_pharmadbadmin';  
+                                               $src="archivepass";
+                                               $userck="ck_prod_arch_user";
+                                               
$fileforward=$root_path."modules/products/products-archive.php".$append.$userck."&from=".$src;
+                                               break;
+       case "dbank":  $title=$LDPharmaDb;
+                                               $allowedarea[] = 
'_a_1_pharmadbadmin';  
+                                               $src="dbankpass";
+                                               $userck="ck_prod_db_user";
+                                               
$fileforward="pharmacy-database-functions.php".$append.$userck."&from=".$src;
+                                               break;
+       case "catalog":  $title=$LDOrderCat;
+                                               $allowedarea[] = 
'_a_1_pharmadbadmin';  
+                                               $src="catalogpass";
+                                               $userck="ck_prod_order_user";
+                                               
$fileforward=$root_path."modules/products/products-ordercatalog-edit.php".$append.$userck."&target=catalog&from=".$src;
+                                               break;
+       case "bot":  $title=$LDPharmaOrderBot;
+                                               $allowedarea[] = 
'_a_1_pharmadbadmin';  
+                                               $src="medibotpass";
+                                               $userck="ck_prod_bot_user";
+                                               
$fileforward=$root_path."modules/pharmacy/pharmacy-orderbot-pass.php".URL_APPEND."&mode=bot&user_origin=pharmabot";
+                                               break;
+       default:        
{header("Location:".$root_path."language/".$lang."/lang_".$lang."_invalid-access-warning.php");
 exit;}; 
+}
+
+$thisfile=basename(__FILE__);
+$breakfile='pharmacy.php'.URL_APPEND;
+$lognote="$LDPharmacy $title ok";
+
+// reset all 2nd level lock cookies
+require($root_path.'include/helpers/inc_2level_reset.php'); 
+setcookie('ck_2level_sid'.$sid,'',0,'/');
+
+require($root_path.'include/helpers/inc_passcheck_internchk.php');
+if ($pass=='check') 
+       include($root_path.'include/helpers/inc_passcheck.php');
+
+$errbuf="$LDPharmacy $title";
+$minimal=1;
+require($root_path.'include/helpers/inc_passcheck_head.php');
+?>
+
+<BODY  <?php if (!$nofocus) echo 
'onLoad="document.passwindow.userid.focus()"'; echo  ' 
bgcolor='.$cfg['body_bgcolor']; 
+ if (!$cfg['dhtml']){ echo ' link='.$cfg['body_txtcolor'].' 
alink='.$cfg['body_alink'].' vlink='.$cfg['body_txtcolor']; } 
+?>>
+
+<p>
+<FONT SIZE=-1  FACE="Arial">
+<P>
+<img src="../../gui/img/common/default/lampboard.gif" border=0 align="middle">
+<FONT  COLOR="<?php echo $cfg[top_txtcolor] ?>"  SIZE=5  FACE="verdana"> 
<b><?php echo "$LDPharmacy :: $title" ?></b></font>
+<p>
+<table width=100% border=0 cellpadding="0" cellspacing="0"> 
+
+<?php require($root_path.'include/helpers/inc_passcheck_mask.php') ?>  
+
+<?php
+require($root_path.'include/helpers/inc_load_copyrite.php');
+?>
+
+
+</FONT>
+
+
+</BODY>
+</HTML>

Modified: care2x/branches/gettext/modules/pharmacy/pharmacy.php
===================================================================
--- care2x/branches/gettext/modules/pharmacy/pharmacy.php       2010-06-30 
12:25:28 UTC (rev 6488)
+++ care2x/branches/gettext/modules/pharmacy/pharmacy.php       2010-06-30 
12:26:49 UTC (rev 6489)
@@ -118,12 +118,12 @@
 
 // Prepare the submenu item links indexed by their template tags
 
-$aSubMenuItem=array('LDPharmaOrder' => "<a 
href=\"apotheke-pass.php".URL_APPEND."&mode=order\">$LDPharmaOrder</a>",
+$aSubMenuItem=array('LDPharmaOrder' => "<a 
href=\"pharmacy-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>",
+                                       'LDOrderCat' => "<a 
href=\"pharmacy-pass.php".URL_APPEND."&mode=catalog\">$LDOrderCat</a>",
+                                       'LDOrderArchive' => "<a 
href=\"pharmacy-pass.php".URL_APPEND."&mode=archive\">$LDOrderArchive</a>",
+                                       'LDPharmaDb' => "<a 
href=\"pharmacy-pass.php".URL_APPEND."&mode=dbank\">$LDPharmaDb</a>",
+                                       'LDOrderBotActivate' => "<a 
href=\"pharmacy-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>"
                                        );


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

Reply via email to