Revision: 6427
http://care2002.svn.sourceforge.net/care2002/?rev=6427&view=rev
Author: mizuko
Date: 2010-06-30 08:37:16 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
see #54
Modified Paths:
--------------
care2x/branches/gettext/modules/doctors/doctors-list-add.php
care2x/branches/gettext/modules/doctors/doctors-main-pass.php
care2x/branches/gettext/modules/doctors/doctors-roster-personal-list.php
care2x/branches/gettext/modules/doctors/doctors-roster-plan.php
care2x/branches/gettext/modules/doctors/doctors-select-dept.php
care2x/branches/gettext/modules/doctors/doctors.php
Modified: care2x/branches/gettext/modules/doctors/doctors-list-add.php
===================================================================
--- care2x/branches/gettext/modules/doctors/doctors-list-add.php
2010-06-30 08:36:28 UTC (rev 6426)
+++ care2x/branches/gettext/modules/doctors/doctors-list-add.php
2010-06-30 08:37:16 UTC (rev 6427)
@@ -14,7 +14,7 @@
if($_SESSION['sess_user_origin']=='personell_admin'){
$local_user='aufnahme_user';
}else{
- $local_user='ck_doctors_dienstplan_user';
+ $local_user='ck_doctors_roster_user';
}
require_once($root_path.'include/helpers/inc_front_chain_lang.php');
Modified: care2x/branches/gettext/modules/doctors/doctors-main-pass.php
===================================================================
--- care2x/branches/gettext/modules/doctors/doctors-main-pass.php
2010-06-30 08:36:28 UTC (rev 6426)
+++ care2x/branches/gettext/modules/doctors/doctors-main-pass.php
2010-06-30 08:37:16 UTC (rev 6427)
@@ -32,7 +32,7 @@
$lognote="Doctors $title ok";
-$userck='ck_doctors_dienstplan_user';
+$userck='ck_doctors_roster_user';
//reset cookie;
// reset all 2nd level lock cookies
Modified:
care2x/branches/gettext/modules/doctors/doctors-roster-personal-list.php
===================================================================
--- care2x/branches/gettext/modules/doctors/doctors-roster-personal-list.php
2010-06-30 08:36:28 UTC (rev 6426)
+++ care2x/branches/gettext/modules/doctors/doctors-roster-personal-list.php
2010-06-30 08:37:16 UTC (rev 6427)
@@ -27,7 +27,7 @@
}
$breakfile=$root_path.'modules/personell_admin/personell_register_show.php'.URL_APPEND.'&target=personell_reg&personell_nr='.$nr;
}else{
- $local_user='ck_doctors_dienstplan_user';
+ $local_user='ck_doctors_roster_user';
$breakfile='javascript:history.back()';
$bShowSearchEntry = TRUE;
}
Modified: care2x/branches/gettext/modules/doctors/doctors-roster-plan.php
===================================================================
--- care2x/branches/gettext/modules/doctors/doctors-roster-plan.php
2010-06-30 08:36:28 UTC (rev 6426)
+++ care2x/branches/gettext/modules/doctors/doctors-roster-plan.php
2010-06-30 08:37:16 UTC (rev 6427)
@@ -12,7 +12,7 @@
*/
$lang_tables[]='departments.php';
define('LANG_FILE','doctors.php');
-$local_user='ck_doctors_dienstplan_user';
+$local_user='ck_doctors_roster_user';
require_once($root_path.'include/helpers/inc_front_chain_lang.php');
if(!isset($dept_nr)||!$dept_nr){
@@ -200,7 +200,7 @@
wh=500;
var tmonth=document.dienstplan.month.value;
var tyear=document.dienstplan.jahr.value;
- urlholder="doctors-roster-poppersonselect.php?elemid="+elem +
"&dept_nr=<?php echo $dept_nr ?>&month="+tmonth+"&year="+tyear+ "&mode=" + mode
+ "&retpath=<?php echo $retpath ?>&user=<?php echo
$ck_doctors_dienstplan_user."&lang=$lang&sid=$sid"; ?>";
+ urlholder="doctors-roster-poppersonselect.php?elemid="+elem +
"&dept_nr=<?php echo $dept_nr ?>&month="+tmonth+"&year="+tyear+ "&mode=" + mode
+ "&retpath=<?php echo $retpath ?>&user=<?php echo
$ck_doctors_roster_user."&lang=$lang&sid=$sid"; ?>";
popselectwin=window.open(urlholder,"pop","width=" + ww + ",height=" +
wh + ",menubar=no,resizable=yes,scrollbars=yes,dependent=yes");
window.popselectwin.moveTo((w/2)+80,(h/2)-(wh/2));
@@ -265,7 +265,7 @@
<input type="hidden" name="pyear" value="<?php echo $pyear; ?>">
<input type="hidden" name="planid" value="<?php echo $ck_plan; ?>">
<input type="hidden" name="maxelement" value="<?php echo $maxdays; ?>">
-<input type="hidden" name="encoder" value="<?php echo
$ck_doctors_dienstplan_user; ?>">
+<input type="hidden" name="encoder" value="<?php echo $ck_doctors_roster_user;
?>">
<input type="hidden" name="retpath" value="<?php echo $retpath; ?>">
<input type="hidden" name="lang" value="<?php echo $lang; ?>">
<input type="hidden" name="sid" value="<?php echo $sid; ?>">
Modified: care2x/branches/gettext/modules/doctors/doctors-select-dept.php
===================================================================
--- care2x/branches/gettext/modules/doctors/doctors-select-dept.php
2010-06-30 08:36:28 UTC (rev 6426)
+++ care2x/branches/gettext/modules/doctors/doctors-select-dept.php
2010-06-30 08:37:16 UTC (rev 6427)
@@ -16,7 +16,7 @@
$local_user='aufnahme_user';
$breakfile=$root_path.'modules/personell_admin/personell_register_show.php'.URL_APPEND.'&target=personell_reg&personell_nr='.$nr;
}else{
- $local_user='ck_doctors_dienstplan_user';
+ $local_user='ck_doctors_roster_user';
if (!empty($_SESSION['sess_path_referer'])){
$breakfile=$root_path.$_SESSION['sess_path_referer'].URL_APPEND;
} else {
Modified: care2x/branches/gettext/modules/doctors/doctors.php
===================================================================
--- care2x/branches/gettext/modules/doctors/doctors.php 2010-06-30 08:36:28 UTC
(rev 6426)
+++ care2x/branches/gettext/modules/doctors/doctors.php 2010-06-30 08:37:16 UTC
(rev 6427)
@@ -20,7 +20,7 @@
$_SESSION['sess_path_referer']=$top_dir.basename(__FILE__);
# Erase the cookie
-if(isset($_COOKIE['ck_doctors_dienstplan_user'.$sid]))
setcookie('ck_doctors_dienstplan_user'.$sid,'',0,'/');
+if(isset($_COOKIE['ck_doctors_roster_user'.$sid]))
setcookie('ck_doctors_roster_user'.$sid,'',0,'/');
# erase the user_origin
if(isset($_SESSION['sess_user_origin'])) $_SESSION['sess_user_origin']='';
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
