changes to fix with current browsers

2020-04-27 16:42:21 -05:00
parent dabe267a33 c80ba0c53c
commit 0849a803ea
80 changed files with 38 additions and 28 deletions
--- a/WebThinkTC.html
+++ b/WebThinkTC.html
--- a/addJavaScriptHash.sh
+++ b/addJavaScriptHash.sh
--- a/config.php.example
+++ b/config.php.example
--- a/consyntools.jar
+++ b/consyntools.jar
--- a/dataTools.js
+++ b/dataTools.js
--- a/deploy/deploy.sh
+++ b/deploy/deploy.sh
--- a/dragNDrop.js
+++ b/dragNDrop.js
--- a/drawLine.js
+++ b/drawLine.js
--- a/fileSelectorControl.js
+++ b/fileSelectorControl.js
--- a/iconControl.js
+++ b/iconControl.js
--- a/icons/arrowDown.png
+++ b/icons/arrowDown.png
--- a/icons/arrowDownExclam.png
+++ b/icons/arrowDownExclam.png
--- a/icons/arrowLeft.png
+++ b/icons/arrowLeft.png
--- a/icons/arrowRight.png
+++ b/icons/arrowRight.png
--- a/icons/arrowUp.png
+++ b/icons/arrowUp.png
--- a/icons/arrowUpExclam.png
+++ b/icons/arrowUpExclam.png
--- a/icons/bulb.png
+++ b/icons/bulb.png
--- a/icons/clock.png
+++ b/icons/clock.png
--- a/icons/cross.png
+++ b/icons/cross.png
--- a/icons/exclamationMark.png
+++ b/icons/exclamationMark.png
--- a/icons/heart.png
+++ b/icons/heart.png
--- a/icons/phone.png
+++ b/icons/phone.png
--- a/icons/questionSign.png
+++ b/icons/questionSign.png
--- a/icons/rose.png
+++ b/icons/rose.png
--- a/icons/smileyBad.png
+++ b/icons/smileyBad.png
--- a/icons/smileyGood.png
+++ b/icons/smileyGood.png
--- a/icons/smileyOh.png
+++ b/icons/smileyOh.png
--- a/icons/smileysBase.xcf
+++ b/icons/smileysBase.xcf
--- a/icons/thumbDown.png
+++ b/icons/thumbDown.png
--- a/icons/thumbUp.png
+++ b/icons/thumbUp.png
--- a/icons/tick.png
+++ b/icons/tick.png
--- a/impressum.html
+++ b/impressum.html
@@ -5,8 +5,8 @@
 </title>
 <body>
 <b>IMPRESSUM:</b><br/>
-Regina Tretter<br/>
-31 Cole Cres<br/>
+Joerg Tretter<br/>
+4/1 Bradley Pl<br/>
 Liberty Grove<br/>
 NSW 2138<br/>
 Australia<br/>
--- a/login.css
+++ b/login.css
--- a/login.js
+++ b/login.js
--- a/login.php
+++ b/login.php
@@ -3,10 +3,10 @@
 		<META HTTP-EQUIV="expires" CONTENT="0">
 		<title>WebThink Login</title>

-		<script src="observerHandling.js"></script>
-		<script src="webRequest.js"></script>
-		<script src="dataTools.js"></script>
-		<script src="login.js"></script>
+		<script src="observerHandling.js?md5=198dbb5bccb51f0eabeea01ac34f9b7b"></script>
+		<script src="webRequest.js?md5=cfd708317cd7292557c3fb7980521185"></script>
+		<script src="dataTools.js?md5=bf5cea95ab29d2effaa5e1c04a498037"></script>
+		<script src="login.js?md5=fa53abbc6b6ed70982ace27ddddca7f1"></script>

 		<LINK REL=stylesheet HREF="miscMain.css" TYPE="text/css">
 		<LINK REL=stylesheet HREF="login.css" TYPE="text/css">
--- a/mainPage.php
+++ b/mainPage.php
@@ -25,21 +25,21 @@ if (!isset($_SESSION['UserPKey'])) {
 		<div id='rightBottom' style='position:absolute;left:100;top:100'>.</div> <!-- regulates the page size. -->
 	</body>

-	<script src="uiTools.js"></script>
-	<script src="observerHandling.js"></script>
-	<script src="dataTools.js"></script>
-	<script src="dragNDrop.js"></script>
-	<script src="workspaceResize.js"></script>
-	<script src="drawLine.js"></script>
-	<script src="webRequest.js"></script>
-	<script src="toolbar.js"></script>
-	<script src="fileSelectorControl.js"></script>
-	<script src="menuBarControl.js"></script>
-	<script src="menuControl.js"></script>
-	<script src="textControl.js"></script>
-	<script src="iconControl.js"></script>
-	<script src="node.js"></script>
-	<script src="nodeRel.js"></script>
+	<script src="uiTools.js?md5=17da623ad4298d370a092102822797b5"></script>
+	<script src="observerHandling.js?md5=198dbb5bccb51f0eabeea01ac34f9b7b"></script>
+	<script src="dataTools.js?md5=bf5cea95ab29d2effaa5e1c04a498037"></script>
+	<script src="dragNDrop.js?md5=f84567f9b38e6a487cd4118ed12f2365"></script>
+	<script src="workspaceResize.js?md5=3f29d56b91df076bb591b717bece1dd1"></script>
+	<script src="drawLine.js?md5=f82876801074b7e9bae05b3405f1d43e"></script>
+	<script src="webRequest.js?md5=cfd708317cd7292557c3fb7980521185"></script>
+	<script src="toolbar.js?md5=2168d17ced9aa6f960f66a0ead3ce4b0"></script>
+	<script src="fileSelectorControl.js?md5=06c8bf806f97c7ef0a5c5a4266c75cbf"></script>
+	<script src="menuBarControl.js?md5=664a74644008a1f5e24eb65d3f4e66fa"></script>
+	<script src="menuControl.js?md5=b72d7534af4cc4d88ee74fcb18cbcd7b"></script>
+	<script src="textControl.js?md5=a2c2137b103320c1ae019282f66e69e9"></script>
+	<script src="iconControl.js?md5=7381cb018841a25a31c6923e5067472a"></script>
+	<script src="node.js?md5=8353922f7f76c62ed169edcc3973ca47"></script>
+	<script src="nodeRel.js?md5=d5b9971b471364f531f164025eba21f4"></script>

 	<script language='JavaScript'>
 	// set debug mode
--- a/menu.css
+++ b/menu.css
--- a/menuBar.css
+++ b/menuBar.css
@@ -1,5 +1,6 @@
 div.menuBar {
 	-moz-border-radius-bottomright:20px;
+	-webkit-border-bottom-right-radius: 20px;
 	position:fixed;
 	top:0px;
 	left:150px;
--- a/menuBarControl.js
+++ b/menuBarControl.js
--- a/menuControl.js
+++ b/menuControl.js
--- a/miscMain.css
+++ b/miscMain.css
--- a/node.css
+++ b/node.css
@@ -4,6 +4,7 @@ span.collapsedNode {
 	-moz-border-radius-bottomright:10px;
 	-moz-border-radius-topleft:10px;
 	-moz-border-radius-topright:10px;
+    -webkit-border-radius: 10px;
 	background:#a41e2a;
 	font-size:13px;
 	padding:10px;
@@ -20,6 +21,7 @@ span.node {
 	-moz-border-radius-bottomright:10px;
 	-moz-border-radius-topleft:10px;
 	-moz-border-radius-topright:10px;
+    -webkit-border-radius: 10px;
 	background:#a41e2a;
 	font-size:13px;
 	padding:10px;
@@ -35,6 +37,7 @@ span.node {
 span.boxToolbar {
 	-moz-border-radius-topleft:5px;
 	-moz-border-radius-topright:5px;
+	-webkit-border-top-left-radius: 5px;
 	background:#BEF76D;
 	color:#000000;
 	min-width:120;
--- a/node.js
+++ b/node.js
@@ -315,7 +315,7 @@ function node(PKey,nodeText) {
 	}

 	function fromXML(inXML){
-		if (inXML.nodeName=="NODE") {
+		if (inXML.nodeName.toUpperCase()=="NODE") {
 			m_PKey=inXML.getAttribute("pkey");
 			m_displayDom.style.left=inXML.getAttribute("offsetleft")+"px";
 			m_displayDom.style.top=inXML.getAttribute("offsettop")+"px";
@@ -323,7 +323,7 @@ function node(PKey,nodeText) {
 			var freeRelations = new Array();
 			for (var i=0;i<inXML.childNodes.length;i++){
 				var theChildNode=inXML.childNodes[i];
-				switch(theChildNode.nodeName){
+				switch(theChildNode.nodeName.toUpperCase()){
 					case "ICONS":
 						m_iconControl=new iconControl().fromXML(theChildNode);
 						break;
--- a/nodeRel.css
+++ b/nodeRel.css
--- a/nodeRel.js
+++ b/nodeRel.js
--- a/obfuscate.sh
+++ b/obfuscate.sh
--- a/observerHandling.js
+++ b/observerHandling.js
--- a/pix/WebthinkLogo.png
+++ b/pix/WebthinkLogo.png
--- a/pix/WebthinkLogoMedium.png
+++ b/pix/WebthinkLogoMedium.png
--- a/pix/ginamail.jpg
+++ b/pix/ginamail.jpg
--- a/pix/icnArrowDown.png
+++ b/pix/icnArrowDown.png
--- a/pix/icnArrowUp.png
+++ b/pix/icnArrowUp.png
--- a/pix/icnBusyWait.png
+++ b/pix/icnBusyWait.png
--- a/pix/icnMoveBranch.png
+++ b/pix/icnMoveBranch.png
--- a/pix/icnNewBranch.png
+++ b/pix/icnNewBranch.png
--- a/pix/icnStar.png
+++ b/pix/icnStar.png
--- a/pix/icnWaste.png
+++ b/pix/icnWaste.png
--- a/profile.html
+++ b/profile.html
--- a/requestTarget.php
+++ b/requestTarget.php
@@ -1,4 +1,4 @@
-<?
+<?php
 error_reporting(0);
 #error_reporting('E_ALL');

@@ -11,6 +11,7 @@ $db=$GLOBALS['conf_dbname'];
 $basePath=$GLOBALS['conf_basePath'];
 $mapPath=$GLOBALS['conf_mapPath'];

+
 function myMail($to,$subject,$message){
 	$fromAddr=$GLOBALS['conf_mailAddress'];
 	$headers = 'From: <' . $fromAddr . ">\r\n" .
@@ -34,7 +35,7 @@ function writeToFile($filename,$text){
 	$cmd="mkdir -p \"$(dirname \"" . $filename . "\")\"";
 	system($cmd);

-	$fp=fopen($filename,'w') or die("Can't open file");
+	$fp=fopen($filename,'w') or die ("Can't open file _" . $filename . "_" );
 	fwrite($fp,$text);
 	fclose($fp);
 }
@@ -111,7 +112,7 @@ function getUserInfo($dh){
 // returns the filename.
 // filePKey must be null for new records
 function getFileNameAndPKey($dh,$filePKey,$description){
-	if ($filePKey=="") {
+	if ($filePKey=="null") {
 		$isNew=true;
 		$filePKey=getNewPKey($dh);
 		$fileName=$_SESSION["UserPKey"] . "/" . $filePKey; // TODO - should include the user
@@ -273,8 +274,13 @@ function logInUser($dh,$mail,$password,$isSetupAutoLogin,$loginToken){
 		$query="Select count(*) \"count\",max(user.pkey) \"userPKey\" from user, userOptin where userOptin.userPKey=user.PKey and userOptin.confirmed='1' and user.mail=" . $dh->quote($mail) . " and user.password=" . $dh->quote($password);
 	}

+
 	$result=$dh->query($query) ;
-	$row=$result->fetch();
+	try {
+		$row=$result->fetch();
+	} catch (Exception $ex) {
+		echo "EX:" . $ex->getMessage();
+	}
 	if ($row['count']==1) {
 		$success="true";
 		$_SESSION['UserPKey']=$row['userPKey'];
--- a/sql/createDB.sql
+++ b/sql/createDB.sql
--- a/sql/exportSchema.sh
+++ b/sql/exportSchema.sh
--- a/sql/prepareIcon.sql
+++ b/sql/prepareIcon.sql
--- a/sql/preparePKey.sql
+++ b/sql/preparePKey.sql
--- a/textControl.js
+++ b/textControl.js
--- a/todoList.txt
+++ b/todoList.txt
--- a/toolbar.js
+++ b/toolbar.js
--- a/tutorial/exampleMap1.png
+++ b/tutorial/exampleMap1.png
--- a/tutorial/freeRelation1.png
+++ b/tutorial/freeRelation1.png
--- a/tutorial/iconMenu1.png
+++ b/tutorial/iconMenu1.png
--- a/tutorial/iconMenu2.png
+++ b/tutorial/iconMenu2.png
--- a/tutorial/icons1.png
+++ b/tutorial/icons1.png
--- a/tutorial/index.html
+++ b/tutorial/index.html
--- a/tutorial/node1.png
+++ b/tutorial/node1.png
--- a/tutorial/node2.png
+++ b/tutorial/node2.png
--- a/tutorial/parentRelation1.png
+++ b/tutorial/parentRelation1.png
--- a/tutorial/relationMenu1.png
+++ b/tutorial/relationMenu1.png
--- a/tutorial/toolBar1.png
+++ b/tutorial/toolBar1.png
--- a/uiTools.js
+++ b/uiTools.js
--- a/webRequest.js
+++ b/webRequest.js
@@ -240,4 +240,4 @@ function getUserInfo(attribute) {
 	var parser=new DOMParser();
 	var doc=parser.parseFromString(txtResp,"text/xml");
 	return(doc.documentElement.getAttribute(attribute));
-}
+}
--- a/workspaceResize.js
+++ b/workspaceResize.js