Skip to content

Commit 796a422

Browse files
committed
Removed old questionaire, closes thorsten#883
1 parent 9113a94 commit 796a422

File tree

3 files changed

+2
-170
lines changed

3 files changed

+2
-170
lines changed

phpmyfaq/inc/PMF/Installer.php

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -886,22 +886,4 @@ public function renderLanguageOptions(Array $languageCodes)
886886

887887
return $options;
888888
}
889-
890-
/**
891-
* Echos the questionnaire data
892-
*
893-
* @return string
894-
*/
895-
public function renderDataList()
896-
{
897-
$questionnaire = new PMF_Questionnaire_Data($this->_mainConfig);
898-
$options = $questionnaire->get();
899-
$dataList = '<dl>' . PHP_EOL;
900-
array_walk($options, 'data_printer');
901-
$dataList .= sprintf(
902-
'</dl><input type="hidden" name="systemdata" value="%s" />',
903-
PMF_String::htmlspecialchars(serialize($questionnaire->get()), ENT_QUOTES)
904-
);
905-
return $dataList;
906-
}
907889
}
Lines changed: 1 addition & 148 deletions
Original file line numberDiff line numberDiff line change
@@ -1,150 +1,3 @@
11
<p class="alert alert-success">
22
Wow, looks like the installation worked like a charm. This is pretty cool, isn't it? :-)
3-
</p>
4-
5-
<script type="text/javascript">
6-
//<![CDATA[
7-
var iframect = 0;
8-
9-
function iframeUpdated() {
10-
if (iframect++ == 0) {
11-
return;
12-
}
13-
14-
$('#questionnaireForm').hide();
15-
$('#questionnaireThanks').show();
16-
}
17-
18-
function hide(item) {
19-
$('#configliste').hide();
20-
}
21-
22-
function show(item) {
23-
$('#configliste').show();
24-
}
25-
//]]>
26-
</script>
27-
<iframe onload="iframeUpdated();" name="questionaireResult" style="display:none"></iframe>
28-
<form action="http://www.phpmyfaq.de/stats/getstatdata.php" method="post" target="questionaireResult"
29-
id="questionnaireForm" class="form-horizontal">
30-
31-
<p>
32-
For further development we would like to get some feedback from our users. Therefore we'd ask you to
33-
take a few minutes of your time to answer a few questions.
34-
</p>
35-
<p class="alert alert-success">
36-
If you don't want to participate in the survey, you can directly visit
37-
<a href="../index.php">your version of phpMyFAQ</a> or login into your
38-
<a href="../admin/index.php">admin section</a>.
39-
</p>
40-
41-
<h3>The survey</h3>
42-
43-
<fieldset>
44-
<legend>General questions</legend>
45-
<div class="control-group">
46-
<label class="control-label">How do you act like?</label>
47-
<div class="controls">
48-
<select name="q[individual]">
49-
<option value="as an individual">as an individual</option>
50-
<option value="as an organisation">as an organisation</option>
51-
</select>
52-
</div>
53-
</div>
54-
<div class="control-group">
55-
<label class="control-label">What kind of organisation is that?</label>
56-
<div class="controls">
57-
<select name="q[organisation]">
58-
<option value="private held">privately held</option>
59-
<option value="public held">publicly held</option>
60-
<option value="government organisation">governmental organisation</option>
61-
<option value="foundation">foundation</option>
62-
<option value="other">other</option>
63-
</select>
64-
</div>
65-
</div>
66-
</fieldset>
67-
68-
<fieldset>
69-
<legend>Technical questions</legend>
70-
<div class="control-group">
71-
<label class="control-label">Where did you install phpMyFAQ?</label>
72-
<div class="controls">
73-
<select name="q[server]">
74-
<option value="server run by a hosting company">server run by a hosting company</option>
75-
<option value="public server run by you/your organisation">public server run by you/your organisation</option>
76-
<option value="private server run by you/your organisation">private server run by you/your organisation</option>
77-
<option value="Don't know">Don't know</option>
78-
</select>
79-
</div>
80-
</div>
81-
</fieldset>
82-
83-
<fieldset>
84-
<legend>Beyond our own nose</legend>
85-
<div class="control-group">
86-
<label class="control-label">Which PHP software do you also use?</label>
87-
<div class="controls">
88-
<input type="text" name="q[other]" />
89-
</div>
90-
</div>
91-
<div class="control-group">
92-
<label class="control-label">Are you using other web technologies?</label>
93-
<div class="controls">
94-
<label class="checkbox inline">
95-
<input type="checkbox" name="q[other][]" value="ASP" />ASP
96-
</label>
97-
<label class="checkbox inline">
98-
<input type="checkbox" name="q[other][]" value="ASP.NET" />ASP.NET
99-
</label>
100-
<label class="checkbox inline">
101-
<input type="checkbox" name="q[other][]" value="jsp" />JAVA JSP
102-
</label>
103-
<label class="checkbox inline">
104-
<input type="checkbox" name="q[other][]" value="perl" />Perl
105-
</label>
106-
<label class="checkbox inline">
107-
<input type="checkbox" name="q[other][]" value="ruby" />Ruby / Ruby on Rails
108-
</label>
109-
<label class="checkbox inline">
110-
<input type="checkbox" name="q[other][]" value="python" />Python
111-
</label>
112-
<label class="checkbox inline">
113-
<input type="checkbox" name="q[other][]" value="clojure" />Clojure
114-
</label>
115-
<label class="checkbox inline">
116-
<input type="checkbox" name="q[other][]" value="scala" />Scala
117-
</label>
118-
<label class="checkbox inline">
119-
<input type="checkbox" name="q[other][]" value="go" />Go
120-
</label>
121-
</div>
122-
</div>
123-
</fieldset>
124-
125-
<p class="alert alert-info">
126-
In addition to your input we're going to submit some information about your system setup for statistical
127-
purposes.
128-
</p>
129-
<p class="alert alert-info">
130-
We are not storing any personal information. You can see the data by clicking
131-
<a href="#" onclick="show('configliste'); return false;">here</a>.
132-
</p>
133-
134-
<div id="configliste" class="hide">
135-
<a href="#" onclick="hide('configliste'); return false;">hide again</a>
136-
{{ dataList|raw }}
137-
</div>
138-
<p style="text-align: center;">
139-
<button class="btn btn-primary" type="submit">
140-
Click here to submit the data and finish the installation process
141-
</button>
142-
</p>
143-
</form>
144-
<div id="questionnaireThanks" style="display:none;">
145-
<p class="alert alert-success"><b>Thank you for giving your feedback!</b></p>
146-
<p>
147-
You can visit <a href="../index.php">your version of phpMyFAQ</a> or login into your
148-
<a href="../admin/index.php">admin section</a>.
149-
</p>
150-
</div>
3+
</p>

phpmyfaq/setup/index.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,7 @@
139139
} else {
140140
$installer->startInstall();
141141

142-
$tplSuccessVars = array(
143-
'dataList' => $installer->renderDataList()
144-
);
145-
$twig->loadTemplate('success.twig')->display($tplSuccessVars);
142+
$twig->loadTemplate('success.twig')->display([]);
146143

147144
$installer->cleanUpFiles();
148145
PMF_System::renderFooter();

0 commit comments

Comments
 (0)