NEW - bug 210: Babel or Babel-like Community Internationalization
https://foundation.eclipse.org/infrazilla/show_bug.cgi?id=210
diff --git a/html/callback/cb_global.php b/html/callback/cb_global.php
index 43c5fea..27377f8 100644
--- a/html/callback/cb_global.php
+++ b/html/callback/cb_global.php
@@ -11,7 +11,7 @@
* Eclipse Foundation
*******************************************************************************/
-if(defined(BABEL_BASE_DIR)){
+if(defined('BABEL_BASE_DIR')){
require_once(BABEL_BASE_DIR."html/global.php");
}else{
define('BABEL_BASE_DIR', "../../");
@@ -21,7 +21,7 @@
InitPage("login");
-if( !function_exists(json_encode) ){
+if( !function_exists('json_encode') ){
require("/home/data/httpd/babel.eclipse.org/html/json_encode.php");
function json_encode($encode){
diff --git a/html/callback/getCurrentStringTranslation.php b/html/callback/getCurrentStringTranslation.php
index 25804fa..b88eace 100644
--- a/html/callback/getCurrentStringTranslation.php
+++ b/html/callback/getCurrentStringTranslation.php
@@ -57,6 +57,7 @@
//print_r($line);
+$trans = "";
if($line['translation_value']){
$trans = " AND translations.value = '".addslashes($line['translation_value'])."'
@@ -154,7 +155,4 @@
<div id="translation-history">Coming soon!</div>
</div>
-
-
-
</form>
diff --git a/html/callback/getFilesForProject.php b/html/callback/getFilesForProject.php
index d599f12..a0b8803 100644
--- a/html/callback/getFilesForProject.php
+++ b/html/callback/getFilesForProject.php
@@ -12,7 +12,6 @@
*******************************************************************************/
require_once("cb_global.php");
-
$query = "select
DISTINCT files.name
from
@@ -39,7 +38,8 @@
while($line = mysql_fetch_array($res, MYSQL_ASSOC)){
$ret = Array();
$ret['name'] = $line['name'];
- if($line['file'] == $_SESSION['file']){
+
+ if(isset($_SESSION['file']) and $line['name'] == $_SESSION['file']){
$ret['current'] = true;
}
$return[] = $ret;
diff --git a/html/callback/getLanguages.php b/html/callback/getLanguages.php
index 787b706..6a603c3 100644
--- a/html/callback/getLanguages.php
+++ b/html/callback/getLanguages.php
@@ -13,6 +13,8 @@
require_once("cb_global.php");
+
+
$query = "select * from languages where is_active = 1 and language_id != 1 order by name";
$res = mysql_query($query,$dbh);
@@ -22,7 +24,7 @@
while($line = mysql_fetch_array($res, MYSQL_ASSOC)){
// $return .= "<li><a href='?language_id=".$line['language_id']."'>".$line['iso_code']. " - ". $line['name']. "</a>";
- if($line['language_id'] == $_SESSION['language']){
+ if(isset($_SESSION['language']) and $line['language_id'] == $_SESSION['language']){
$line['current'] = true;
}
$return[] = $line;
diff --git a/html/callback/getProjects.php b/html/callback/getProjects.php
index 3cf7620..a17fcc8 100644
--- a/html/callback/getProjects.php
+++ b/html/callback/getProjects.php
@@ -35,7 +35,7 @@
$ret = Array();
$ret['project'] = $line['project_id'];
// $ret['version'] = $line['version'];
- if($line['project_id'] == $_SESSION['project']){
+ if(isset($_SESSION['project']) and $line['project_id'] == $_SESSION['project']){
$ret['current'] = true;
}
$return[] = $ret;
diff --git a/html/callback/getStringsforProject.php b/html/callback/getStringsforProject.php
index 1c5cc48..4391ac1 100644
--- a/html/callback/getStringsforProject.php
+++ b/html/callback/getStringsforProject.php
@@ -22,11 +22,18 @@
// AWAITING (TRANSLATED BUT NO RAITINGS YET)
$state = $App->getHTTPParameter("state", "POST");
-if(!$proj_post){
- $project_id = $_SESSION['project'];
- $version = $_SESSION['version'];
- $language = $_SESSION['language'];
- $file = $_SESSION['file'];
+if(!isset($proj_post)){
+ if(isset($_SESSION['project']))
+ $project_id = $_SESSION['project'];
+
+ if(isset($_SESSION['version']))
+ $version = $_SESSION['version'];
+
+ if(isset($_SESSION['language']))
+ $language = $_SESSION['language'];
+
+ if(isset($_SESSION['file']))
+ $file = $_SESSION['file'];
}
switch($state){
case "flagged" :
@@ -177,7 +184,7 @@
$stringids = Array();
$return = Array();
while($line = mysql_fetch_array($res, MYSQL_ASSOC)){
- if($stringids[$line['stringId']] ){
+ if(isset($stringids[$line['stringId']])){
continue;
}else{
$return[] = $line;
diff --git a/html/callback/getVersionsforProject.php b/html/callback/getVersionsforProject.php
index 21152f0..aa2aac1 100644
--- a/html/callback/getVersionsforProject.php
+++ b/html/callback/getVersionsforProject.php
@@ -13,6 +13,11 @@
require_once("cb_global.php");
+
+if(!isset($_SESSION['project'])){
+ return array();
+}
+
$query = "select
DISTINCT files.version,files.project_id
from
@@ -34,7 +39,7 @@
while($line = mysql_fetch_array($res, MYSQL_ASSOC)){
$ret = Array();
$ret['version'] = $line['version'];
- if($line['version'] == $_SESSION['version']){
+ if(isset($_SESSION['version']) and $line['version'] == $_SESSION['version']){
$ret['current'] = true;
}
$return[] = $ret;
diff --git a/html/callback/setCurrentFile.php b/html/callback/setCurrentFile.php
index 0614238..a9ab673 100644
--- a/html/callback/setCurrentFile.php
+++ b/html/callback/setCurrentFile.php
@@ -15,6 +15,6 @@
$_SESSION['file'] = $App->getHTTPParameter("file", "POST");
-print_r($_SESSION);
+//print_r($_SESSION);
?>
\ No newline at end of file
diff --git a/html/global.php b/html/global.php
index fc32bfe..c6cd93c 100644
--- a/html/global.php
+++ b/html/global.php
@@ -10,7 +10,9 @@
* Paul Colton (Aptana)- initial API and implementation
* Eclipse Foundation
*******************************************************************************/
-define('BABEL_BASE_DIR', "../");
+if(!defined('BABEL_BASE_DIR')){
+ define('BABEL_BASE_DIR', "../");
+}
define('USE_PHOENIX', true);
define("COOKIE_REMEMBER", "cBABEL");
define("COOKIE_SESSION" , "sBABEL");
diff --git a/html/index.php b/html/index.php
index 2a70c23..ac091e8 100644
--- a/html/index.php
+++ b/html/index.php
@@ -21,6 +21,12 @@
//$_SESSION['language'] = "";
//$_SESSION['project'] = "";
//$_SESSION['version'] = "";
+
+$USERNAME = $App->getHTTPParameter("username", "POST");
+$PASSWORD = $App->getHTTPParameter("password", "POST");
+$REMEMBER = $App->getHTTPParameter("remember", "POST");
+$SUBMIT = $App->getHTTPParameter("submit", "POST");
+
?>
<h1 id="page-message">Welcome to the Babel Project</h1>
@@ -83,7 +89,5 @@
<script>YAHOO.languageManager.getAjaxLanguages();</script>
<?php
-
-
include("foot.php");
?>
\ No newline at end of file
diff --git a/html/js/files.js b/html/js/files.js
index b5756e0..b9a737c 100644
--- a/html/js/files.js
+++ b/html/js/files.js
@@ -18,7 +18,10 @@
},
success: function(o) {
var domNode = document.getElementById('files-area');
- var response = eval("("+o.responseText+")");
+ var response;
+ if(o.responseText){
+ response = eval("("+o.responseText+")");
+ }
if(response){
// YAHOO.log(o.responseText);
domNode.innerHTML = "";
@@ -35,7 +38,6 @@
}else{
domNode.innerHTML = "";
}
-
YAHOO.projectStringsManager.getAjaxProjectStrings();
},
failure: function(o) {
diff --git a/html/js/projectString.js b/html/js/projectString.js
index 4eee990..b65edd7 100644
--- a/html/js/projectString.js
+++ b/html/js/projectString.js
@@ -13,6 +13,7 @@
YAHOO.projectStringsManager = {
getAjaxProjectStrings : function(){
+
if(!YAHOO.languageManager.getSelected() ||
!YAHOO.projectManager.getSelected() ||
!YAHOO.versionManager.getSelected() ||
diff --git a/html/js/version.js b/html/js/version.js
index 0593f38..70c8b84 100644
--- a/html/js/version.js
+++ b/html/js/version.js
@@ -18,7 +18,10 @@
},
success: function(o) {
var domNode = document.getElementById('version-area');
- var response = eval("("+o.responseText+")");
+ var response;
+ if(o.responseText){
+ response = eval("("+o.responseText+")");
+ }
if(response){
// YAHOO.log(o.responseText);
domNode.innerHTML = "";