Skip to content

Commit

Permalink
Fixes to get multi-language at least a little working.
Browse files Browse the repository at this point in the history 
git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/phpsurveyor@2075 b72ed6b6-b9f8-46b5-92b4-906544132732
  • Loading branch information
@c-schmitz
c-schmitz committed Oct 6, 2006
1 parent 2de88a7 commit f6ae051
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 23 deletions.
11 changes: 5 additions & 6 deletions admin/html.php
View file
Expand Up @@ -286,7 +286,7 @@
$sumquery3 = "SELECT * FROM {$dbprefix}questions WHERE sid=$surveyid"; //Getting a count of questions for this survey
$sumresult3 = $connect->Execute($sumquery3);
$sumcount3 = $sumresult3->RecordCount();
$sumquery2 = "SELECT * FROM ".db_table_name('groups')." WHERE sid=$surveyid AND language='".$defaultlang."'"; //Getting a count of groups for this survey
$sumquery2 = "SELECT * FROM ".db_table_name('groups')." WHERE sid=$surveyid AND language='".$defaultlang."'"; //Getting a count of groups for this survey
$sumresult2 = $connect->Execute($sumquery2);
$sumcount2 = $sumresult2->RecordCount();
$sumquery1 = "SELECT * FROM ".db_table_name('surveys')." WHERE sid=$surveyid LIMIT 1"; //Getting data for this survey
Expand Down Expand Up @@ -424,7 +424,7 @@
$surveysummary .= "\t\t\t\t\t<img src='$imagefiles/blank.gif' alt='' width='40' align='left' border='0' hspace='0'>\n";
}

if($activated!="Y" && getGroupSum($surveyid)>1 && $sumrows5['define_questions'])
if($activated!="Y" && getGroupSum($surveyid,$s1row['language'])>1 && $sumrows5['define_questions'])
{
$surveysummary .= "<a href=\"#\" onclick=\"window.open('$scriptname?action=ordergroups&amp;sid=$surveyid', '_top')\""
. "onmouseout=\"hideTooltip()\""
Expand Down Expand Up @@ -612,14 +612,13 @@
. _("Template:")."</strong></font></td>\n"
. "\t\t<td>$setfont {$s1row['template']}</font></td></tr>\n"
. "\t<tr $showstyle id='surveydetails8'><td align='right' valign='top'>$setfont<strong>"
. _("Language:")."</strong></font></td>\n";
. _("Base Language:")."</strong></font></td>\n";
if (!$s1row['language']) {$language=getLanguageNameFromCode($currentadminlang);} else {$language=getLanguageNameFromCode($s1row['language']);}
$surveysummary .= "\t<td>$setfont$language</font></td></tr>\n";


$surveysummary .= "\t<tr $showstyle id='surveydetails8'><td align='right' valign='top'>$setfont<strong>"
// . _("Available_languages:")."</strong></font></td>\n";
. "Available_languages: </strong></font></td>\n";
. _("Additional Languages:")."</strong></font></td>\n";
if (!$s1row['available_languages']) {$available_languages=$defaultlang;} else
{$available_languages=$s1row['available_languages'];}
$surveysummary .= "\t<td>$setfont$available_languages</font></td></tr>\n";
Expand Down Expand Up @@ -1253,7 +1252,7 @@
}
else
{
$loginsummary = $loginfailed . "<form name='login' id='login' method='post' action='$rooturl/admin/admin.php' ><br /><strong>"._("You have to login first.")."</strong><br /> <br />
$loginsummary = "<form name='login' id='login' method='post' action='$rooturl/admin/admin.php' ><br /><strong>"._("You have to login first.")."</strong><br /> <br />
<table>
<tr>
<td><p>"._("Username")."</p></td>
Expand Down
9 changes: 5 additions & 4 deletions admin/install/create-mysql.sql
View file
Expand Up @@ -22,7 +22,7 @@ CREATE TABLE `prefix_answers` (
`answer` text NOT NULL,
`default_value` char(1) NOT NULL default 'N',
`sortorder` varchar(5) default NULL,
`answer_language` varchar(20) default 'en',
`language` varchar(20) default 'en',
PRIMARY KEY (`qid`,`code`)
) TYPE=MyISAM;

Expand Down Expand Up @@ -73,7 +73,7 @@ CREATE TABLE `prefix_groups` (
`group_code` varchar(50) NOT NULL default '',
`group_order` int(11) NOT NULL default '0',
`description` text,
`group_language` varchar(20) default 'en',
`language` varchar(20) default 'en',
PRIMARY KEY (`gid`)
) TYPE=MyISAM AUTO_INCREMENT=1 ;

Expand All @@ -88,7 +88,7 @@ CREATE TABLE `prefix_labels` (
`code` varchar(5) NOT NULL default '',
`title` varchar(100) NOT NULL default '',
`sortorder` varchar(5) default NULL,
`label_language` varchar(20) default 'en',
`language` varchar(20) default 'en',
PRIMARY KEY (`lid`,`code`)
) TYPE=MyISAM;

Expand Down Expand Up @@ -137,7 +137,7 @@ CREATE TABLE `prefix_questions` (
`mandatory` char(1) default NULL,
`lid` int(11) NOT NULL default '0',
`question_order` int(11) NOT NULL,
`question_language` varchar(20) default 'en',
`language` varchar(20) default 'en',
PRIMARY KEY (`qid`)
) TYPE=MyISAM AUTO_INCREMENT=1 ;

Expand Down Expand Up @@ -186,6 +186,7 @@ CREATE TABLE `prefix_surveys` (
`url` varchar(255) default NULL,
`urldescrip` varchar(255) default NULL,
`language` varchar(50) default NULL,
`available_languages` varchar(255) default NULL,
`datestamp` char(1) default 'N',
`usecookie` char(1) default 'N',
`notification` char(1) default '0',
Expand Down
12 changes: 8 additions & 4 deletions admin/install/upgrade-mysql.php
View file
Expand Up @@ -9,13 +9,17 @@ function db_upgrade($oldversion) {
/// older versions to match current functionality

if ($oldversion < 109) {
modify_database("","ALTER TABLE `prefix_answers` ADD `answer_language` varchar(20) default 'en'");
modify_database("","ALTER TABLE `prefix_questions` ADD `question_language` varchar(20) default 'en'");
modify_database("","ALTER TABLE `prefix_groups` ADD `group_language` varchar(20) default 'en'");
modify_database("","ALTER TABLE `prefix_labels` ADD `label_language` varchar(20) default 'en'");
modify_database("","ALTER TABLE `prefix_answers` ADD `language` varchar(20) default 'en'");
modify_database("","ALTER TABLE `prefix_questions` ADD `language` varchar(20) default 'en'");
modify_database("","ALTER TABLE `prefix_groups` ADD `language` varchar(20) default 'en'");
modify_database("","ALTER TABLE `prefix_labels` ADD `language` varchar(20) default 'en'");
modify_database("","UPDATE `prefix_settings_global` SET stg_value='109' where stg_name ='DBVersion'");
}

if ($oldversion < 110) {
modify_database("","ALTER TABLE `prefix_surveys` ADD `available_languages` varchar(255)");
}


return true;
}
Expand Down
19 changes: 10 additions & 9 deletions common.php
View file
Expand Up @@ -201,12 +201,6 @@ function showadminmenu()
$adminmenu .= "\t\t\t\t\t<img src='$imagefiles/blank.gif' alt='' width='11' align='left'>\n"
. "\t\t\t\t\t<img src='$imagefiles/seperator.gif' alt='' align='left'>\n";

$adminmenu .= "\t\t\t\t\t<a href=\"#\" onClick=\"window.open('$scriptname?action=logoutuser', '_top')\"" .
"onmouseout=\"hideTooltip()\""
. "onmouseover=\"showTooltip(event,'"._("Logout")."');return false\">" .
"<img src='$imagefiles/logout.png' name='Logout'"
." title='' alt='"._("Logout")."' align='left'></a>";

// edit users
$adminmenu .= "\t\t\t\t\t<a href=\"#\" onClick=\"window.open('$scriptname?action=editusers', '_top')\"" .
"onmouseout=\"hideTooltip()\""
Expand Down Expand Up @@ -316,7 +310,11 @@ function showadminmenu()
. "onmouseover=\"showTooltip(event,'"._("Show Help")."');return false\">"
. "<img src='$imagefiles/showhelp.png' name='ShowHelp' title=''"
. "alt='". _("Show Help")."' align='right' ></a>"
. "\t\t\t\t\t<img src='$imagefiles/blank.gif' alt='' width='40' height='20' align='right' >\n"
. "\t\t\t\t\t<a href=\"#\" onClick=\"window.open('$scriptname?action=logoutuser', '_top')\""
. "onmouseout=\"hideTooltip()\""
. "onmouseover=\"showTooltip(event,'"._("Logout")."');return false\">"
. "<img src='$imagefiles/logout.png' name='Logout'"
. "title='' alt='"._("Logout")."' align='right'></a>"
. "\t\t\t\t\t<img src='$imagefiles/seperator.gif' alt='' align='right' border='0' hspace='0'>\n";

if($_SESSION['USER_RIGHT_CREATE_SURVEY'] == 1)
Expand All @@ -340,6 +338,9 @@ function showadminmenu()
. "</table>\n";
return $adminmenu;
}



//DATA TYPES
$qtypeselect = getqtypelist();

Expand Down Expand Up @@ -458,10 +459,10 @@ function getquestions()
return $questionselecter;
}

function getGroupSum($surveyid)
function getGroupSum($surveyid, $lang)
{
global $surveyid,$dbprefix ;
$sumquery3 = "SELECT * FROM ".db_table_name('groups')." WHERE sid=$surveyid AND language='".$_SESSION['s_lang']."'"; //Getting a count of questions for this survey
$sumquery3 = "SELECT * FROM ".db_table_name('groups')." WHERE sid=$surveyid AND language='".$lang."'"; //Getting a count of questions for this survey

$sumresult3 = db_execute_assoc($sumquery3);
$groupscount = $sumresult3->RecordCount();
Expand Down

0 comments on commit f6ae051

Please sign in to comment.