Merge pull request #449 from kfischer/448-switchlanguage

(issue #448) Can't switch language if Coral runs on a non-standard port
coral-erm · Jul 5, 2018 · 6549a6f · 6549a6f
2 parents 46f7bce + eb2cee4
commit 6549a6f
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/auth/admin.php b/auth/admin.php
@@ -158,7 +158,7 @@ function setLanguage(lang) {
         var cookievalid=2592000000; // 30 days (1000*60*60*24*30)
         time += cookievalid;
         now.setTime(time);
-        document.cookie ='lang='+lang+';path=/'+';domain='+wl.host+';expires='+now;
+        document.cookie ='lang='+lang+';path=/'+';domain='+wl.hostname+';expires='+now;
     }
 </script>
 <script type="text/javascript" src="js/admin.js"></script>

diff --git a/auth/index.php b/auth/index.php
@@ -290,7 +290,7 @@ function setLanguage(lang) {
             var cookievalid=2592000000; // 30 days (1000*60*60*24*30)
             time += cookievalid;
 			now.setTime(time);
-			document.cookie ='lang='+lang+';path=/'+';domain='+wl.host+';expires='+now;
+			document.cookie ='lang='+lang+';path=/'+';domain='+wl.hostname+';expires='+now;
 	    }
     </script>
 <script type="text/javascript">

diff --git a/index.php b/index.php
@@ -145,7 +145,7 @@ function setLanguage(lang) {
 			var cookievalid=2592000000; // 30 days (1000*60*60*24*30)
 			time += cookievalid;
 			now.setTime(time);
-			document.cookie ='lang='+lang+';path=/'+';domain='+wl.host+';expires='+now;
+			document.cookie ='lang='+lang+';path=/'+';domain='+wl.hostname+';expires='+now;
 		}
 	</script>
 </body>

diff --git a/licensing/templates/header.php b/licensing/templates/header.php
@@ -390,7 +390,7 @@ function setLanguage(lang) {
             var cookievalid=2592000000; // 30 days (1000*60*60*24*30)
             time += cookievalid;
 			now.setTime(time);
-			document.cookie ='lang='+lang+';path=/'+';domain='+wl.host+';expires='+now;
+			document.cookie ='lang='+lang+';path=/'+';domain='+wl.hostname+';expires='+now;
 	    }
     </script>
 <span id='span_message' style='color:red;text-align:left;'><?php if (isset($err)) echo $err; ?></span>
diff --git a/management/templates/header.php b/management/templates/header.php
@@ -325,7 +325,7 @@ function setLanguage(lang) {
             var cookievalid=2592000000; // 30 days (1000*60*60*24*30)
             time += cookievalid;
 			now.setTime(time);
-			document.cookie ='lang='+lang+';path=/'+';domain='+wl.host+';expires='+now;
+			document.cookie ='lang='+lang+';path=/'+';domain='+wl.hostname+';expires='+now;
 	    }
     </script>
 <span id='span_message' style='color:red;text-align:left;'><?php if (isset($err)) echo $err; ?></span>
diff --git a/organizations/templates/header.php b/organizations/templates/header.php
@@ -299,7 +299,7 @@ function setLanguage(lang) {
                 var cookievalid=2592000000; // 30 days (1000*60*60*24*30)
                 time += cookievalid;
                 now.setTime(time);
-                document.cookie ='lang='+lang+';path=/'+';domain='+wl.host+';expires='+now;
+                document.cookie ='lang='+lang+';path=/'+';domain='+wl.hostname+';expires='+now;
             }
         </script>
 <span id='span_message' style='color:red;text-align:left;'><?php if (isset($_POST['message'])) echo $_POST['message']; if (isset($errorMessage)) echo $errorMessage; ?></span>
diff --git a/reports/index.php b/reports/index.php
@@ -172,7 +172,7 @@ function setLanguage(lang) {
         var cookievalid=2592000000; // 30 days (1000*60*60*24*30)
         time += cookievalid;
 		now.setTime(time);
-		document.cookie ='lang='+lang+';path=/'+';domain='+wl.host+';expires='+now;
+		document.cookie ='lang='+lang+';path=/'+';domain='+wl.hostname+';expires='+now;
     }
 </script>
 
diff --git a/resources/templates/header.php b/resources/templates/header.php
@@ -283,7 +283,7 @@ function setLanguage(lang) {
             var cookievalid=2592000000; // 30 days (1000*60*60*24*30)
             time += cookievalid;
 			now.setTime(time);
-			document.cookie ='lang='+lang+';path=/'+';domain='+wl.host+';expires='+now;
+			document.cookie ='lang='+lang+';path=/'+';domain='+wl.hostname+';expires='+now;
 	    }
     </script>
 <span id='span_message' class='darkRedText' style='text-align:left;'><?php if (isset($_POST['message'])) echo $_POST['message']; if (isset($errorMessage)) echo $errorMessage; ?></span>
diff --git a/usage/templates/header.php b/usage/templates/header.php
@@ -313,7 +313,7 @@ function setLanguage(lang) {
             var cookievalid=2592000000; // 30 days (1000*60*60*24*30)
             time += cookievalid;
 			now.setTime(time);
-			document.cookie ='lang='+lang+';path=/'+';domain='+wl.host+';expires='+now;
+			document.cookie ='lang='+lang+';path=/'+';domain='+wl.hostname+';expires='+now;
 	    }
     </script>
 <span id='span_message' style='color:red;text-align:left;'><?php if (isset($err)) echo $err; ?></span>