Skip to content

Commit

Permalink
Still working in tokens Part 2
Browse files Browse the repository at this point in the history 
git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/phpsurveyor@2234 b72ed6b6-b9f8-46b5-92b4-906544132732
  • Loading branch information
@c-schmitz
c-schmitz committed Feb 4, 2007
1 parent 2f3d7bd commit 33dfab8
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 20 deletions.
7 changes: 4 additions & 3 deletions admin/admin.php
View file
Expand Up @@ -44,6 +44,7 @@
if (!isset($lid)) {$lid=returnglobal('lid');} //LabelID
if (!isset($code)) {$code=returnglobal('code');} // ??
if (!isset($action)) {$action=returnglobal('action');} //Desired action
if (!isset($subaction)) {$subaction=returnglobal('subaction');}//Desired sibaction
if (!isset($ok)) {$ok=returnglobal('ok');} // ??
if (!isset($fp)) {$fp=returnglobal('filev');} //??
if (!isset($elem)) {$elem=returnglobal('elem');} //??
Expand Down Expand Up @@ -174,8 +175,8 @@
$action=="editsurvey" || $action=="updatesurvey" || $action=="ordergroups" || $action=="addusertogroup" ||
$action=="uploadf" || $action=="newsurvey" || $action=="listsurveys" ||
$action=="addgroup" || $action=="editgroup" || $action=="surveyrights" ) include("html.php");

if (!isset($printablesurveyoutput)) // For a few actions we dont want to have the header
// echo $action.$subaction;
if (!isset($printablesurveyoutput) && $subaction!='export' ) // For a few actions we dont want to have the header
{
if (!isset($_SESSION['metaHeader'])) {$_SESSION['metaHeader']='';}
$adminoutput = getAdminHeader($_SESSION['metaHeader']).$adminoutput; // Alle future output is written into this and then outputted at the end of file
Expand Down Expand Up @@ -233,7 +234,7 @@



if (!isset($printablesurveyoutput))
if (!isset($printablesurveyoutput) && $subaction!='export')
{
$adminoutput.= "\t\t</td>\n".helpscreen()
. "\t</tr>\n"
Expand Down
29 changes: 18 additions & 11 deletions admin/tokens.php
View file
Expand Up @@ -41,8 +41,8 @@
{
require_once(dirname(__FILE__).'/../config-ldap.php');
}
if (!isset($action)) {$action=returnglobal('action');}
if (!isset($subaction)) {$subaction=returnglobal('subaction');}
//if (!isset($action)) {$action=returnglobal('action');}
//if (!isset($subaction)) {$subaction=returnglobal('subaction');}
if (!isset($surveyid)) {$surveyid=returnglobal('sid');}
if (!isset($order)) {$order=returnglobal('order');}
if (!isset($limit)) {$limit=returnglobal('limit');}
Expand Down Expand Up @@ -235,14 +235,14 @@
."</font></td></tr>\n"
."<tr>\n"
."<td bgcolor='#DDDDDD' align='center'><form method='post' >\n"
."The following old token tables could be restored:<br />\n"
._("The following old token tables could be restored:")."<br />\n"
."<select size='4' name='oldtable'>\n";
foreach($oldlist as $ol)
{
$tokenoutput .= "<option>".$ol."</option>\n";
}
$tokenoutput .= "</select><br />\n"
."<input type='submit' value='Restore'>\n"
."<input type='submit' value='"._("Restore")."'>\n"
."<input type='hidden' name='restoretable' value='Y'>\n"
."<input type='hidden' name='sid' value='$surveyid'>\n"
."</form></td>\n"
Expand Down Expand Up @@ -453,11 +453,11 @@
."\t\t\t<img src='$imagefiles/seperator.gif' alt='' border='0' hspace='0' align='left'>\n"
."\t\t\t\n"
."\t\t\t<table align='left' cellpadding='0' cellspacing='0' border='0'>\n"
."\t\t\t\t<tr><td><form method='post' action='$homeurl/tokens.php'>\n"
."\t\t\t\t<tr><td><form method='post' action='$scriptname?action=tokens'>\n"
."\t\t\t\t\t<input type='text' name='searchstring' value='$searchstring'>\n"
."\t\t\t\t\t<input type='submit' value='"._("Search")."'>\n"
."\t\t\t\t<input type='hidden' name='order' value='$order'>\n"
."\t\t\t\t<input type='hidden' $subaction value='search'>\n"
."\t\t\t\t<input type='hidden' name='subaction' value='search'>\n"
."\t\t\t\t<input type='hidden' name='sid' value='$surveyid'>\n"
."\t\t\t\t</form></td>\n"
."\t\t\t</tr></table>\n"
Expand Down Expand Up @@ -1051,14 +1051,18 @@
$edresult = $connect->Execute($edquery);
$edfieldcount = $edresult->FieldCount();
}

$tokenoutput .= "\t<tr bgcolor='#555555'><td colspan='2' height='4'><font size='1' face='verdana' color='white'><strong>"
._("Add or Edit Token")."</strong></font></td></tr>\n"
."\t<tr><td align='center'>\n"
."<form method='post' action='$scriptname?action=tokens'>\n"
."<table width='100%' bgcolor='#CCCCCC' align='center'>\n"
."<tr>\n"
."\t<td align='right' width='20%'><strong>ID:</strong></font></td>\n"
."\t<td bgcolor='#EEEEEE'>{}Auto</font></td>\n"
."\t<td bgcolor='#EEEEEE'>";
if ($subaction == "edit")
{$tokenoutput .=$_GET['tid'];} else {$tokenoutput .="Auto";}
$tokenoutput .= "</font></td>\n"
."</tr>\n"
."<tr>\n"
."\t<td align='right' width='20%'><strong>"._("First Name").":</strong></font></td>\n"
Expand Down Expand Up @@ -1093,7 +1097,10 @@
."<tr>\n"
."\t<td align='right' width='20%'><strong>"._("Language").":</strong></font></td>\n"
."\t<td bgcolor='#EEEEEE'>";
$tokenoutput .= languageDropdownClean($surveyid,GetBaseLanguageFromSurveyID($surveyid));
if (isset($language)) {$tokenoutput .= languageDropdownClean($surveyid,$language);}
else {
$tokenoutput .= languageDropdownClean($surveyid,GetBaseLanguageFromSurveyID($surveyid));
}
$tokenoutput .= "</font></td>\n"
."</tr>\n"

Expand Down Expand Up @@ -1138,7 +1145,7 @@
switch($subaction)
{
case "edit":
$tokenoutput .= "\t\t<input type='submit' value='"._("Update")."'>\n"
$tokenoutput .= "\t\t<input type='submit' value='"._("Update Token")."'>\n"
."\t\t<input type='hidden' name='subaction' value='updatetoken'>\n"
."\t\t<input type='hidden' name='tid' value='{$_GET['tid']}'>\n";
break;
Expand Down Expand Up @@ -1436,11 +1443,11 @@

function form($error=false)
{
global $surveyid, $tokenoutput;
global $surveyid, $tokenoutput,$scriptname;

if ($error) {$tokenoutput .= $error . "<br /><br />\n";}

$tokenoutput .= "<form enctype='multipart/form-data' action='" . $_SERVER['PHP_SELF'] . "' method='post'>\n"
$tokenoutput .= "<form enctype='multipart/form-data' action='$scriptname?action=tokens' method='post'>\n"
. "<input type='hidden' name='subaction' value='upload' />\n"
. "<input type='hidden' name='sid' value='$surveyid' />\n"
. "Upload a file<br />\n"
Expand Down
Binary file modified locale/de/LC_MESSAGES/de.mo
View file
Binary file not shown.
25 changes: 19 additions & 6 deletions locale/de/LC_MESSAGES/de.po
View file
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PHPSurveyor German language file\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2007-02-02 22:50+0100\n"
"PO-Revision-Date: 2007-02-04 00:19+0100\n"
"Last-Translator: \n"
"Language-Team: PHPSurveyor <c_schmitz@users.sourceforge.net>\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -1346,6 +1346,9 @@ msgstr "Umfrage-Sicherheitseinstellungen"
msgid "Do Survey"
msgstr "Umfrage ausführen/testen"

msgid "Please select a language:"
msgstr "Bitte wählen Sie eine Sprache aus:"

msgid "Edit Current Survey"
msgstr "Diese Umfrage bearbeiten"

Expand Down Expand Up @@ -2607,6 +2610,13 @@ msgstr "Wenn Sie Tokens initialisieren für diese Umfrage, wird die Umfrage nur
msgid "Do you want to create a tokens table for this survey?"
msgstr "Möchten Sie eine Probandentabelle mit Zugangsschlüsseln für diese Umfrage erstellen?"

msgid "The following old token tables could be restored:"
msgstr "Die folgenden alten Zugangsschlüssel-Tabelle können wiederhergestellt werden:"

# D:\web\xampp\htdocs\phpsurveyor/admin/html.php:3214
msgid "Restore"
msgstr "Wiederherstellen"

msgid "Display Tokens"
msgstr "Zeige Probanden an"

Expand Down Expand Up @@ -2798,6 +2808,9 @@ msgstr "Proband hinzufügen oder bearbeiten"
msgid "You can leave this blank, and automatically generate tokens using 'Create Tokens'"
msgstr "Sie können dieses Feld leer lassen und automatisch eindeutige Zugangsschlüssel generieren lassen mit 'Generiere eindeutige Zugangsschlüssel'"

msgid "Add Token"
msgstr "Zugangschlüssel hinzufügen"

msgid "Updated Token"
msgstr "Proband aktualisiert"

Expand All @@ -2819,7 +2832,7 @@ msgstr "LDAP Einträge hochladen"

# D:\web\xampp\htdocs\phpsurveyor/admin/tokens.php:1246
msgid "LDAP queries are defined by the administrator in the config-ldap.php file"
msgstr ""
msgstr "LDAP Abfragen werden durch den Administrator in der Datei config-ldap.php definiert"

msgid "Upload file not found. Check your permissions and path for the upload directory"
msgstr "Hochgeladene Datei nicht gefunden. überprüfen Sie Ihre Berechtigung und den Pfad des Upload-Verzeichnisses."
Expand All @@ -2842,11 +2855,11 @@ msgstr ""

# D:\web\xampp\htdocs\phpsurveyor/admin/tokens.php:1420
msgid "Can't connect to the Ldap directory"
msgstr ""
msgstr "Mit dem LDAP Verzeichnis konnte nicht verbunden werden"

# D:\web\xampp\htdocs\phpsurveyor/admin/tokens.php:1464
msgid "Ldap disabled or no LDAP query defined."
msgstr ""
# D:\web\xampp\htdocs\phpsurveyor/admin/tokens.php:1461
msgid "LDAP is disabled or no LDAP query defined."
msgstr "LDAP is deaktiviert oder keine LDAP Abfrage definiert."

# D:\web\xampp\htdocs\phpsurveyor/admin/tokens.php:1471
msgid "Select the Ldap query you want:"
Expand Down

0 comments on commit 33dfab8

Please sign in to comment.