[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gforge-commits] gforge/www/survey index.php, 1.6, 1.7 survey.php, 1.4,
From: |
hunkim |
Subject: |
[Gforge-commits] gforge/www/survey index.php, 1.6, 1.7 survey.php, 1.4, 1.5 survey_resp.php, 1.8, 1.9 |
Date: |
Thu, 19 Feb 2004 19:23:55 -0600 |
Update of /cvsroot/gforge/gforge/www/survey
In directory db.perdue.net:/tmp/cvs-serv31475/www/survey
Modified Files:
index.php survey.php survey_resp.php
Log Message:
* Rewrite the Survey module
* Added a general graph module for Survey results
Index: index.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/survey/index.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- index.php 4 Nov 2003 16:33:55 -0000 1.6
+++ index.php 20 Feb 2004 01:23:53 -0000 1.7
@@ -11,49 +11,34 @@
*
*/
-
require_once('pre.php');
-require_once('vote_function.php');
-require_once('www/survey/survey_utils.php');
+require_once('common/survey/SurveyFactory.class');
+require_once('www/survey/include/SurveyHTML.class');
+/* We need a group_id */
if (!$group_id) {
- echo
"<h1>".$Language->getText('survey_index','for_some_reason')."</h1>";
+ exit_no_group();
}
-survey_header(array('title'=>$Language->getText('survey_index','title'),'pagename'=>'survey','titlevals'=>array(group_getname($group_id))));
-
-Function ShowResultsGroupSurveys($result) {
- global $group_id;
- global $Language;
- $rows = db_numrows($result);
- $cols = db_numfields($result);
- $title_arr=array();
- $title_arr[]=$Language->getText('survey_index','survey_title');
- echo $GLOBALS['HTML']->listTableTop ($title_arr);
-
- for($j=0; $j<$rows; $j++) {
- echo "<tr ". $GLOBALS['HTML']->boxGetAltRowStyle($j) .">\n";
- for ($i=1; $i<$cols; $i++) {
- echo "<td><a
href=\"survey.php?group_id=$group_id&survey_id=".db_result($result,$j,"survey_id")."\">";
- printf("%s",db_result($result,$j,$i));
- echo "</a></td>\n";
- }
- echo "</tr>";
- }
- echo $GLOBALS['HTML']->listTableBottom();
+$g =& group_get_object($group_id);
+if (!$g || !is_object($g) || $g->isError()) {
+ exit_no_group();
}
-$sql="SELECT survey_id,survey_title FROM surveys WHERE group_id='$group_id'
AND is_active='1'";
+$user_id = user_getid();
-$result=db_query($sql);
+/* Show header */
+$sh = new SurveyHtml();
+$sh->header(array('title'=>$Language->getText('survey_index','title'),'pagename'=>'survey','titlevals'=>array(group_getname($group_id))));
-if (!$result || db_numrows($result) < 1) {
- echo "<h2>".$Language->getText('survey_index','this_group_has')."</h2>";
- echo db_error();
+/* Show list of Servey */
+$sf = new SurveyFactory($g);
+$ss = & $sf->getSurveys();
+if (!$ss) {
+ echo ($Language->getText('survey_error', 'no_survey_found'));
} else {
- ShowResultsGroupSurveys($result);
+ echo($sh->showSurveys($ss, 0, 0, 1, 1, 1, 0));
}
-survey_footer(array());
-
+$sh->footer(array());
?>
Index: survey.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/survey/survey.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- survey.php 21 Feb 2003 21:38:58 -0000 1.4
+++ survey.php 20 Feb 2004 01:23:53 -0000 1.5
@@ -13,22 +13,36 @@
require_once('pre.php');
-require_once('vote_function.php');
-require_once('www/survey/survey_utils.php');
+require_once('common/survey/Survey.class');
+require_once('www/survey/include/SurveyHTML.class');
+
+
+/* We need a group_id */
+if (!$group_id) {
+ exit_no_group();
+}
+
+$g =& group_get_object($group_id);
+if (!$g || !is_object($g) || $g->isError()) {
+ exit_no_group();
+}
// Check to make sure they're logged in.
if (!session_loggedin()) {
exit_not_logged_in();
}
-survey_header(array('title'=>$Language->getText('survey','title'),'pagename'=>'survey_survey'));
+$sh = new SurveyHtml();
+$s = new Survey($g, $survey_id);
-if (!$survey_id || !$group_id) {
- echo "<h1>".$Language->getText('survey','for_some_reason')."</h1>";
+$sh->header(array('title'=>$Language->getText('survey','title'),'pagename'=>'survey_survey'));
+
+if (!$survey_id) {
+ echo "<h1>".$Language->getText('survey','for_some_reason')."</h1>";
} else {
- show_survey($group_id,$survey_id);
+ echo($sh->ShowSurveyForm($s));
}
-survey_footer(array());
+$sh->footer(array());
?>
Index: survey_resp.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/survey/survey_resp.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- survey_resp.php 25 Nov 2003 02:57:47 -0000 1.8
+++ survey_resp.php 20 Feb 2004 01:23:53 -0000 1.9
@@ -13,16 +13,24 @@
require_once('pre.php');
-require_once('www/survey/survey_utils.php');
+require_once('common/survey/Survey.class');
+require_once('common/survey/SurveyResponse.class');
+require_once('www/survey/include/SurveyHTML.class');
-survey_header(array('title'=>$Language->getText('survey_resp','title'),'pagename'=>'survey_survey_resp'));
+$g =& group_get_object($group_id);
+if (!$g || !is_object($g) || $g->isError()) {
+ exit_no_group();
+}
-if (!$survey_id || !$group_id) {
+$sh = new SurveyHtml();
+$sh->header(array('title'=>$Language->getText('survey_resp','title'),'pagename'=>'survey_survey_resp'));
+
+if (!$survey_id) {
/*
Quit if params are not provided
*/
echo
"<h1>".$Language->getText('survey_resp','error_some_reason')."</h1>";
- survey_footer(array());
+ $sh->footer(array());
exit;
}
@@ -32,7 +40,7 @@
*/
echo
"<h1>".$Language->getText('survey_resp','you_nedd_to_be_logged_in')."</h1>";
echo
"<p>".$Language->getText('survey_resp','unfortunately_you_have_to_be')."</p>";
- survey_footer(array());
+ $sh->footer(array());
exit;
}
@@ -48,43 +56,32 @@
/*
Delete this customer's responses in case they had back-arrowed
*/
-
$result=db_query("DELETE FROM survey_responses WHERE survey_id='" .
addslashes($survey_id) . "' AND group_id='" . addslashes($group_id) . "' AND
user_id='".user_getid()."'");
/*
Select this survey from the database
*/
-
-$sql="select * from surveys where survey_id='$survey_id'";
-
-$result=db_query($sql);
-
-/*
- Select the questions for this survey
-*/
-$questions = db_result($result, 0, "survey_questions");
-$questions = str_replace(" ", "", $questions);
-$quest_array=explode(',', $questions);
+$s = new Survey($g, $survey_id);
+$quest_array= & $s->getQuestionArray();
$count=count($quest_array);
$now=time();
-for ($i=0; $i<$count; $i++) {
-
- /*
- Insert each form value into the responses table
- */
+/* Make a dummy SurveyResponses for creating */
+$sr = new SurveyResponse($g);
- $val="_" . $quest_array[$i];
+for ($i=0; $i<$count; $i++) {
+ /* Insert each form value into the responses table */
+
+ $val="_" . $quest_array[$i];
+ $response = $$val;
- $sql="INSERT INTO survey_responses
(user_id,group_id,survey_id,question_id,response,post_date) ".
- "VALUES ('".user_getid()."','" . addslashes($group_id) . "','"
. addslashes($survey_id) . "','" . addslashes($quest_array[$i]) . "','".
htmlspecialchars(addslashes($$val)) . "','$now')";
- $result=db_query($sql);
- if (!$result) {
- echo $Language->getText('survey_resp','error');
- }
+ $sr->create(user_getid(), $survey_id, $quest_array[$i], $response);
+ if ($sr->isError()) {
+ echo $sr->getErrorMessage();
+ }
}
-survey_footer(array());
+$sh->footer(array());
?>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gforge-commits] gforge/www/survey index.php, 1.6, 1.7 survey.php, 1.4, 1.5 survey_resp.php, 1.8, 1.9,
hunkim <=