Revision: 6419
http://care2002.svn.sourceforge.net/care2002/?rev=6419&view=rev
Author: mizuko
Date: 2010-06-29 18:58:17 +0000 (Tue, 29 Jun 2010)
Log Message:
-----------
see #54
Modified Paths:
--------------
care2x/branches/gettext/installer/db/sql/mysql_dump.sql
care2x/branches/gettext/main/spediens-bdienst-zeit-erfassung.php
care2x/branches/gettext/modules/doctors/doctors-dienst-schnellsicht.php
care2x/branches/gettext/modules/doctors/doctors-main-pass.php
care2x/branches/gettext/modules/doctors/doctors-select-dept.php
care2x/branches/gettext/modules/nursing_or/nursing-or-dienst-personalliste.php
care2x/branches/gettext/modules/nursing_or/nursing-or-dienst-schnellsicht.php
care2x/branches/gettext/modules/nursing_or/nursing-or-dienstplan-day.php
care2x/branches/gettext/modules/nursing_or/nursing-or-dienstplan.php
care2x/branches/gettext/modules/nursing_or/nursing-or-select-dept.php
care2x/branches/gettext/modules/op_document/op-docu-archive.php
care2x/branches/gettext/modules/op_document/op-docu-pass.php
care2x/branches/gettext/modules/op_document/op-docu-search.php
care2x/branches/gettext/modules/op_document/op-docu-select-dept.php
care2x/branches/gettext/modules/op_document/op-docu-start.php
care2x/branches/gettext/modules/or_logbook/op-nursing-select-dept.php
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-arch-javastart.php
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-javastart.php
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-pass.php
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-such-javastart.php
Modified: care2x/branches/gettext/installer/db/sql/mysql_dump.sql
===================================================================
--- care2x/branches/gettext/installer/db/sql/mysql_dump.sql 2010-06-29
18:56:24 UTC (rev 6418)
+++ care2x/branches/gettext/installer/db/sql/mysql_dump.sql 2010-06-29
18:58:17 UTC (rev 6419)
@@ -4890,7 +4890,7 @@
INSERT INTO care_menu_main VALUES ('5', '20', 'Medocs', '', 'LDMedocs',
'modules/medocs/medocs_pass.php', '1', '', '', 20030922232015, 00000000000000);
INSERT INTO care_menu_main VALUES ('6', '25', 'Doctors', '', 'LDDoctors',
'modules/doctors/doctors.php', '1', '', '', 20030922232015, 00000000000000);
INSERT INTO care_menu_main VALUES ('7', '35', 'Nursing', '','LDNursing',
'modules/nursing/nursing.php', '1', '', '', 20030922232015, 00000000000000);
-INSERT INTO care_menu_main VALUES ('8', '40', 'OR', 'LDOR', '',
'main/op-doku.php', '1', '', '', 20030922232015, 00000000000000);
+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);
Modified: care2x/branches/gettext/main/spediens-bdienst-zeit-erfassung.php
===================================================================
--- care2x/branches/gettext/main/spediens-bdienst-zeit-erfassung.php
2010-06-29 18:56:24 UTC (rev 6418)
+++ care2x/branches/gettext/main/spediens-bdienst-zeit-erfassung.php
2010-06-29 18:58:17 UTC (rev 6419)
@@ -25,7 +25,7 @@
$thisfile='spediens-bdienst-zeit-erfassung.php';
if($retpath=='spec') $breakfile="spediens.php".URL_APPEND;
- else $breakfile="op-doku.php".URL_APPEND;
+ else $breakfile="op-docu.php".URL_APPEND;
/********************************* Resolve the department and op room
***********************/
/* Load date formatter */
@@ -227,9 +227,9 @@
<?php
switch($retpath)
{
- case "op": $rettarget="op-doku.php?sid=$sid"; break;
+ case "op": $rettarget="op-docu.php?sid=$sid"; break;
case "spec": $rettarget="spediens.php?sid=$sid"; break;
- default: $rettarget="op-doku.php?sid=$sid"; break;
+ default: $rettarget="op-docu.php?sid=$sid"; break;
}
?>
Modified:
care2x/branches/gettext/modules/doctors/doctors-dienst-schnellsicht.php
===================================================================
--- care2x/branches/gettext/modules/doctors/doctors-dienst-schnellsicht.php
2010-06-29 18:56:24 UTC (rev 6418)
+++ care2x/branches/gettext/modules/doctors/doctors-dienst-schnellsicht.php
2010-06-29 18:58:17 UTC (rev 6419)
@@ -28,7 +28,7 @@
switch($retpath)
{
case "docs": $breakfile='doctors.php'.URL_APPEND; break;
- case "op": $breakfile=$root_path.'main/op-doku.php'.URL_APPEND; break;
+ case "op": $breakfile=$root_path.'main/op-docu.php'.URL_APPEND; break;
default: $breakfile='doctors.php'.URL_APPEND;
}
Modified: care2x/branches/gettext/modules/doctors/doctors-main-pass.php
===================================================================
--- care2x/branches/gettext/modules/doctors/doctors-main-pass.php
2010-06-29 18:56:24 UTC (rev 6418)
+++ care2x/branches/gettext/modules/doctors/doctors-main-pass.php
2010-06-29 18:58:17 UTC (rev 6419)
@@ -26,7 +26,7 @@
$thisfile=basename(__FILE__);
switch($retpath){
- case 'op': $breakfile=$root_path.'main/op-doku.php'.URL_APPEND;
+ case 'op': $breakfile=$root_path.'main/op-docu.php'.URL_APPEND;
default: $breakfile='doctors.php'.URL_APPEND;
}
Modified: care2x/branches/gettext/modules/doctors/doctors-select-dept.php
===================================================================
--- care2x/branches/gettext/modules/doctors/doctors-select-dept.php
2010-06-29 18:56:24 UTC (rev 6418)
+++ care2x/branches/gettext/modules/doctors/doctors-select-dept.php
2010-06-29 18:58:17 UTC (rev 6419)
@@ -30,7 +30,7 @@
switch($retpath)
{
case "docs": $breakfile='doctors.php'.URL_APPEND; break;
- case "op": $breakfile='op-doku.php'.URL_APPEND; break;
+ case "op": $breakfile='op-docu.php'.URL_APPEND; break;
}
*/
Modified:
care2x/branches/gettext/modules/nursing_or/nursing-or-dienst-personalliste.php
===================================================================
---
care2x/branches/gettext/modules/nursing_or/nursing-or-dienst-personalliste.php
2010-06-29 18:56:24 UTC (rev 6418)
+++
care2x/branches/gettext/modules/nursing_or/nursing-or-dienst-personalliste.php
2010-06-29 18:58:17 UTC (rev 6419)
@@ -81,7 +81,7 @@
if(!empty($ipath)){
switch($ipath){
- case 'menu':
$breakfile=$root_path.'main/op-doku.php'.URL_APPEND; break;
+ case 'menu':
$breakfile=$root_path.'main/op-docu.php'.URL_APPEND; break;
case 'qview':
$breakfile="nursing-or-dienst-schnellsicht.php".URL_APPEND."&hilitedept=$dept_nr";
break;
case 'plan':
$breakfile="nursing-or-dienstplan-planen.php".URL_APPEND."&dept_nr=$dept_nr&pmonth=$pmonth&pyear=$pyear&retpath=$retpath";
break;
default: $breakfile="javascript:window.history.back()";
Modified:
care2x/branches/gettext/modules/nursing_or/nursing-or-dienst-schnellsicht.php
===================================================================
---
care2x/branches/gettext/modules/nursing_or/nursing-or-dienst-schnellsicht.php
2010-06-29 18:56:24 UTC (rev 6418)
+++
care2x/branches/gettext/modules/nursing_or/nursing-or-dienst-schnellsicht.php
2010-06-29 18:58:17 UTC (rev 6419)
@@ -28,7 +28,7 @@
$breakfile=$_SESSION['sess_path_referer'];
} else {
/* default startpage */
- $breakfile = $root_path.'main/op-doku.php';
+ $breakfile = $root_path.'main/op-docu.php';
}
$breakfile=$root_path.$breakfile.URL_APPEND;
@@ -39,7 +39,7 @@
switch($retpath)
{
case "docs": $breakfile='doctors.php'.URL_APPEND; break;
- case "op": $breakfile='op-doku.php'.URL_APPEND; break;
+ case "op": $breakfile='op-docu.php'.URL_APPEND; break;
}
Modified:
care2x/branches/gettext/modules/nursing_or/nursing-or-dienstplan-day.php
===================================================================
--- care2x/branches/gettext/modules/nursing_or/nursing-or-dienstplan-day.php
2010-06-29 18:56:24 UTC (rev 6418)
+++ care2x/branches/gettext/modules/nursing_or/nursing-or-dienstplan-day.php
2010-06-29 18:58:17 UTC (rev 6419)
@@ -27,7 +27,7 @@
switch($retpath)
{
- case "menu":
$rettarget=$root_path.'modules/main/op-doku.php'.URL_APPEND; break;
+ case "menu":
$rettarget=$root_path.'modules/main/op-docu.php'.URL_APPEND; break;
case "qview":
$rettarget=$root_path.'modules/nursing_or/nursing-or-dienst-schnellsicht.php'.URL_APPEND;
break;
case "calendar_opt":
$rettarget=$root_path."modules/calendar/calendar-options.php".URL_APPEND."&dept_nr=$dept_nr&forcestation=1&day=$pday&month=$pmonth&year=$pyear";break;
default: $rettarget="javascript:window.history.back()";
Modified: care2x/branches/gettext/modules/nursing_or/nursing-or-dienstplan.php
===================================================================
--- care2x/branches/gettext/modules/nursing_or/nursing-or-dienstplan.php
2010-06-29 18:56:24 UTC (rev 6418)
+++ care2x/branches/gettext/modules/nursing_or/nursing-or-dienstplan.php
2010-06-29 18:58:17 UTC (rev 6419)
@@ -39,7 +39,7 @@
switch($retpath)
{
- case "menu": $rettarget=$root_path.'main/op-doku.php'.URL_APPEND; break;
+ case "menu": $rettarget=$root_path.'main/op-docu.php'.URL_APPEND; break;
case "qview":
$rettarget='nursing-or-dienst-schnellsicht.php'.URL_APPEND.'&hilitedept='.$dept_nr;
break;
default: $rettarget="javascript:window.history.back()";
}
Modified: care2x/branches/gettext/modules/nursing_or/nursing-or-select-dept.php
===================================================================
--- care2x/branches/gettext/modules/nursing_or/nursing-or-select-dept.php
2010-06-29 18:56:24 UTC (rev 6418)
+++ care2x/branches/gettext/modules/nursing_or/nursing-or-select-dept.php
2010-06-29 18:58:17 UTC (rev 6419)
@@ -32,7 +32,7 @@
$breakfile=$root_path.$_SESSION['sess_path_referer'].URL_APPEND;
} else {
/* default startpage */
- $breakfile = $root_path.'op-doku.php'.URL_APPEND;
+ $breakfile = $root_path.'op-docu.php'.URL_APPEND;
}
}
@@ -42,7 +42,7 @@
switch($retpath)
{
case "docs": $breakfile='doctors.php'.URL_APPEND; break;
- case "op": $breakfile='op-doku.php'.URL_APPEND; break;
+ case "op": $breakfile='op-docu.php'.URL_APPEND; break;
}
*/
Modified: care2x/branches/gettext/modules/op_document/op-docu-archive.php
===================================================================
--- care2x/branches/gettext/modules/op_document/op-docu-archive.php
2010-06-29 18:56:24 UTC (rev 6418)
+++ care2x/branches/gettext/modules/op_document/op-docu-archive.php
2010-06-29 18:58:17 UTC (rev 6419)
@@ -36,7 +36,7 @@
//$db->debug=1;
$thisfile=basename(__FILE__);
-$breakfile=$root_path.'main/op-doku.php'.URL_APPEND;
+$breakfile=$root_path.'main/op-docu.php'.URL_APPEND;
# Save dept name to session
if(!isset($_SESSION['sess_dept_name'])) $_SESSION['sess_dept_name'] = "";
Modified: care2x/branches/gettext/modules/op_document/op-docu-pass.php
===================================================================
--- care2x/branches/gettext/modules/op_document/op-docu-pass.php
2010-06-29 18:56:24 UTC (rev 6418)
+++ care2x/branches/gettext/modules/op_document/op-docu-pass.php
2010-06-29 18:58:17 UTC (rev 6419)
@@ -25,7 +25,7 @@
$lognote="OP docs $lognote ok";
-$breakfile=$root_path.'main/op-doku.php'.URL_APPEND;
+$breakfile=$root_path.'main/op-docu.php'.URL_APPEND;
$userck='ck_opdoku_user';
Modified: care2x/branches/gettext/modules/op_document/op-docu-search.php
===================================================================
--- care2x/branches/gettext/modules/op_document/op-docu-search.php
2010-06-29 18:56:24 UTC (rev 6418)
+++ care2x/branches/gettext/modules/op_document/op-docu-search.php
2010-06-29 18:58:17 UTC (rev 6419)
@@ -67,7 +67,7 @@
require_once($root_path.'include/helpers/inc_config_color.php'); // load color
preferences
$thisfile=basename(__FILE__);
-$breakfile=$root_path.'main/op-doku.php'.URL_APPEND;
+$breakfile=$root_path.'main/op-docu.php'.URL_APPEND;
//foreach($arg as $v) echo "$v<br>"; //init db parameters
Modified: care2x/branches/gettext/modules/op_document/op-docu-select-dept.php
===================================================================
--- care2x/branches/gettext/modules/op_document/op-docu-select-dept.php
2010-06-29 18:56:24 UTC (rev 6418)
+++ care2x/branches/gettext/modules/op_document/op-docu-select-dept.php
2010-06-29 18:58:17 UTC (rev 6419)
@@ -22,7 +22,7 @@
switch($retpath)
{
case "docs": $breakfile='doctors.php'.URL_APPEND; break;
- case "op": $breakfile='op-doku.php'.URL_APPEND; break;
+ case "op": $breakfile='op-docu.php'.URL_APPEND; break;
}
*/
if (!empty($_SESSION['sess_path_referer'])){
Modified: care2x/branches/gettext/modules/op_document/op-docu-start.php
===================================================================
--- care2x/branches/gettext/modules/op_document/op-docu-start.php
2010-06-29 18:56:24 UTC (rev 6418)
+++ care2x/branches/gettext/modules/op_document/op-docu-start.php
2010-06-29 18:58:17 UTC (rev 6419)
@@ -85,7 +85,7 @@
if ((substr($matchcode,0,1)=='%')||(substr($matchcode,0,1)=='&'))
{header("Location:'.$root_path.'language/".$lang."/lang_".$lang."_invalid-access-warning.php");
exit;};
-$breakfile=$root_path.'main/op-doku.php'.URL_APPEND;
+$breakfile=$root_path.'main/op-docu.php'.URL_APPEND;
$thisfile=basename(__FILE__);
/* Set color values for the search mask */
Modified: care2x/branches/gettext/modules/or_logbook/op-nursing-select-dept.php
===================================================================
--- care2x/branches/gettext/modules/or_logbook/op-nursing-select-dept.php
2010-06-29 18:56:24 UTC (rev 6418)
+++ care2x/branches/gettext/modules/or_logbook/op-nursing-select-dept.php
2010-06-29 18:58:17 UTC (rev 6419)
@@ -52,11 +52,11 @@
switch($retpath)
{
case "docs": $breakfile='doctors.php'.URL_APPEND; break;
- case "op": $breakfile='op-doku.php'.URL_APPEND; break;
+ case "op": $breakfile='op-docu.php'.URL_APPEND; break;
}
*/
/* default startpage */
-$breakfile = $root_path.'main/op-doku.php'.URL_APPEND;
+$breakfile = $root_path.'main/op-docu.php'.URL_APPEND;
$pday=date(j);
$pmonth=date(n);
Modified:
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-arch-javastart.php
===================================================================
---
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-arch-javastart.php
2010-06-29 18:56:24 UTC (rev 6418)
+++
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-arch-javastart.php
2010-06-29 18:58:17 UTC (rev 6419)
@@ -40,7 +40,7 @@
?>
logbuchwin=window.open("op-pflege-logbuch-arch-start.php?sid=<?php echo
"$sid&lang=$lang&dept_nr=$dept_nr";?>","archlogbuchwin","menubar=no,resizable=yes,scrollbars=yes,
width=" + (w-15) + ", height=" + (h-60));
window.logbuchwin.moveTo(0,0);
- window.location.replace('<?php if($retpath=="calendar_opt") echo
$root_path."calendar/calendar-options.php?sid=$sid&lang=$lang&day=$pday&month=$pmonth&year=$pyear";
else echo
$root_path."main/op-doku.php?sid=".$sid."&lang=".$lang;?>&forcestation=1&nofocus=1');
+ window.location.replace('<?php if($retpath=="calendar_opt") echo
$root_path."calendar/calendar-options.php?sid=$sid&lang=$lang&day=$pday&month=$pmonth&year=$pyear";
else echo
$root_path."main/op-docu.php?sid=".$sid."&lang=".$lang;?>&forcestation=1&nofocus=1');
}
</script>
Modified:
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-javastart.php
===================================================================
--- care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-javastart.php
2010-06-29 18:56:24 UTC (rev 6418)
+++ care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-javastart.php
2010-06-29 18:58:17 UTC (rev 6419)
@@ -45,7 +45,7 @@
logbuchwin=window.open("<?php echo $root_path.$top_dir;
?>op-pflege-logbuch-start.php?sid=<?php echo
"$sid&lang=$lang&internok=$internok&dept_nr=$dept_nr&saal=$saal";
?>","logbuchwin<?php echo $sid ?>","menubar=no,resizable=yes,scrollbars=yes,
width=" + (w-15) + ", height=" + (h-60));
window.logbuchwin.moveTo(0,0);
- window.location.replace('<?php if($retpath=="calendar_opt") echo
$root_path."calendar/calendar-options.php?sid=$sid&lang=$lang&day=$pday&month=$pmonth&year=$pyear";
else echo
$root_path."main/op-doku.php?sid=".$sid."&lang=".$lang;?>&forcestation=1&nofocus=1&nointern=1');
+ window.location.replace('<?php if($retpath=="calendar_opt") echo
$root_path."calendar/calendar-options.php?sid=$sid&lang=$lang&day=$pday&month=$pmonth&year=$pyear";
else echo
$root_path."main/op-docu.php?sid=".$sid."&lang=".$lang;?>&forcestation=1&nofocus=1&nointern=1');
}
</script>
Modified: care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-pass.php
===================================================================
--- care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-pass.php
2010-06-29 18:56:24 UTC (rev 6418)
+++ care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-pass.php
2010-06-29 18:58:17 UTC (rev 6419)
@@ -15,7 +15,7 @@
$breakfile=$root_path."modules/calendar/calendar-options.php".URL_APPEND."&dept_nr=$dept_nr&retpath=$retpath&day=$pday&month=$pmonth&year=$pyear";
}else{
$append=URL_APPEND;
- $breakfile=$root_path."main/op-doku.php".URL_APPEND;
+ $breakfile=$root_path."main/op-docu.php".URL_APPEND;
}
if(!isset($dept_nr)) $dept_nr='';
Modified:
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-such-javastart.php
===================================================================
---
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-such-javastart.php
2010-06-29 18:56:24 UTC (rev 6418)
+++
care2x/branches/gettext/modules/or_logbook/op-pflege-logbuch-such-javastart.php
2010-06-29 18:58:17 UTC (rev 6419)
@@ -40,7 +40,7 @@
?>
logbuchwin<?php echo $sid
?>=window.open("op-pflege-logbuch-xtsuch-start.php?sid=<?php echo
"$sid&lang=$lang&dept_nr=$dept_nr";?>&user=<?php echo str_replace("
","+",$op_pflegelogbuch_user);?>","logbuchwin<?php echo $sid
?>","menubar=no,resizable=yes,scrollbars=yes, width=" + (w-15) + ", height=" +
(h-60));
window.logbuchwin<?php echo $sid ?>.moveTo(0,0);
- window.location.replace('<?php if($retpath=="calendar_opt") echo
$root_path."calendar/calendar-options.php?sid=$sid&lang=$lang&day=$pday&month=$pmonth&year=$pyear";
else echo
$root_path."main/op-doku.php?sid=".$sid."&lang=".$lang;?>&forcestation=1&nofocus=1');
+ window.location.replace('<?php if($retpath=="calendar_opt") echo
$root_path."calendar/calendar-options.php?sid=$sid&lang=$lang&day=$pday&month=$pmonth&year=$pyear";
else echo
$root_path."main/op-docu.php?sid=".$sid."&lang=".$lang;?>&forcestation=1&nofocus=1');
}
</script>
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/care2002-developers
