From: Zach Copley Date: Mon, 21 Mar 2011 23:51:38 +0000 (-0700) Subject: * Move stuff around again X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b0ed4cb89ab35ad82ebdba9c5529bd50b8138846;p=quix0rs-gnu-social.git * Move stuff around again * Make answers save --- diff --git a/plugins/QnA/QnAPlugin.php b/plugins/QnA/QnAPlugin.php new file mode 100644 index 0000000000..ba3b6e329a --- /dev/null +++ b/plugins/QnA/QnAPlugin.php @@ -0,0 +1,465 @@ +. + * + * @category QnA + * @package StatusNet + * @author Zach Copley + * @copyright 2011 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + // This check helps protect against security problems; + // your code file can't be executed directly from the web. + exit(1); +} + +/** + * Question and Answer plugin + * + * @category Plugin + * @package StatusNet + * @author Zach Copley + * @copyright 2011 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ +class QnAPlugin extends MicroAppPlugin +{ + /** + * Set up our tables (question and answer) + * + * @see Schema + * @see ColumnDef + * + * @return boolean hook value; true means continue processing, false means stop. + */ + function onCheckSchema() + { + $schema = Schema::get(); + + $schema->ensureTable('qna_question', QnA_Question::schemaDef()); + $schema->ensureTable('qna_answer', QnA_Answer::schemaDef()); + $schema->ensureTable('qna_vote', QnA_Vote::schemaDef()); + + return true; + } + + /** + * Load related modules when needed + * + * @param string $cls Name of the class to be loaded + * + * @return boolean hook value; true means continue processing, false means stop. + */ + function onAutoload($cls) + { + $dir = dirname(__FILE__); + + switch ($cls) + { + case 'QnanewquestionAction': + case 'QnanewanswerAction': + case 'QnashowquestionAction': + case 'QnashowanswerAction': + case 'QnavoteAction': + include_once $dir . '/actions/' + . strtolower(mb_substr($cls, 0, -6)) . '.php'; + return false; + case 'QnaquestionForm': + case 'QnaanswerForm': + case 'QnavoteForm'; + include_once $dir . '/lib/' . strtolower($cls).'.php'; + break; + case 'QnA_Question': + case 'QnA_Answer': + case 'QnA_Vote': + include_once $dir . '/classes/' . $cls.'.php'; + return false; + break; + default: + return true; + } + } + + /** + * Map URLs to actions + * + * @param Net_URL_Mapper $m path-to-action mapper + * + * @return boolean hook value; true means continue processing, false means stop. + */ + + function onRouterInitialized($m) + { + $UUIDregex = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'; + + $m->connect( + 'main/qna/newquestion', + array('action' => 'qnanewquestion') + ); + $m->connect( + 'main/qna/newanswer/:id', + array('action' => 'qnanewanswer'), + array('id' => $UUIDregex) + ); + $m->connect( + 'question/vote/:id', + array('action' => 'qnavote', 'type' => 'question'), + array('id' => $UUIDregex) + ); + $m->connect( + 'question/:id', + array('action' => 'qnashowquestion'), + array('id' => $UUIDregex) + ); + $m->connect( + 'answer/vote/:id', + array('action' => 'qnavote', 'type' => 'answer'), + array('id' => $UUIDregex) + ); + $m->connect( + 'answer/:id', + array('action' => 'qnashowanswer'), + array('id' => $UUIDregex) + ); + + return true; + } + + function onPluginVersion(&$versions) + { + $versions[] = array( + 'name' => 'QnA', + 'version' => STATUSNET_VERSION, + 'author' => 'Zach Copley', + 'homepage' => 'http://status.net/wiki/Plugin:QnA', + 'description' => + _m('Question and Answers micro-app.') + ); + return true; + } + + function appTitle() { + return _m('Question'); + } + + function tag() { + return 'question'; + } + + function types() { + return array( + QnA_Question::OBJECT_TYPE, + QnA_Answer::OBJECT_TYPE + ); + } + + /** + * Given a parsed ActivityStreams activity, save it into a notice + * and other data structures. + * + * @param Activity $activity + * @param Profile $actor + * @param array $options=array() + * + * @return Notice the resulting notice + */ + function saveNoticeFromActivity($activity, $actor, $options=array()) + { + if (count($activity->objects) != 1) { + throw new Exception('Too many activity objects.'); + } + + $questionObj = $activity->objects[0]; + + if ($questinoObj->type != QnA_Question::OBJECT_TYPE) { + throw new Exception('Wrong type for object.'); + } + + $notice = null; + + switch ($activity->verb) { + case ActivityVerb::POST: + $notice = Question::saveNew( + $actor, + $questionObj->title + // null, + // $questionObj->summary, + // $options + ); + break; + case Answer::NORMAL: + $question = QnA_Question::staticGet('uri', $questionObj->id); + if (empty($question)) { + // FIXME: save the question + throw new Exception("Answer to unknown question."); + } + $notice = QnA_Answer::saveNew($actor, $question, $activity->verb, $options); + break; + default: + throw new Exception("Unknown verb for question"); + } + + return $notice; + } + + /** + * Turn a Notice into an activity object + * + * @param Notice $notice + * + * @return ActivityObject + */ + + function activityObjectFromNotice($notice) + { + $question = null; + + switch ($notice->object_type) { + case QnA_Question::OBJECT_TYPE: + $question = QnA_Question::fromNotice($notice); + break; + case QnA_Answer::OBJECT_TYPE: + $answer = QnA_Answer::fromNotice($notice); + $question = $answer->getQuestion(); + break; + } + + if (empty($question)) { + throw new Exception("Unknown object type."); + } + + $notice = $question->getNotice(); + + if (empty($notice)) { + throw new Exception("Unknown question notice."); + } + + $obj = new ActivityObject(); + + $obj->id = $question->uri; + $obj->type = QnA_Question::OBJECT_TYPE; + $obj->title = $question->title; + $obj->link = $notice->bestUrl(); + + // XXX: probably need other stuff here + + return $obj; + } + + /** + * Change the verb on Answer notices + * + * @param Notice $notice + * + * @return ActivityObject + */ + + function onEndNoticeAsActivity($notice, &$act) { + switch ($notice->object_type) { + case Answer::NORMAL: + case Answer::ANONYMOUS: + $act->verb = $notice->object_type; + break; + } + return true; + } + + /** + * Custom HTML output for our notices + * + * @param Notice $notice + * @param HTMLOutputter $out + */ + + function showNotice($notice, $out) + { + switch ($notice->object_type) { + case QnA_Question::OBJECT_TYPE: + $this->showQuestionNotice($notice, $out); + break; + case QnA_Answer::OBJECT_TYPE: + $this->showAnswerNotice($notice, $out); + break; + } + + // bad craziness + $out->elementStart('div', array('class' => 'question')); + + $profile = $notice->getProfile(); + $avatar = $profile->getAvatar(AVATAR_MINI_SIZE); + + $out->element( + 'img', + array( + 'src' => ($avatar) + ? $avatar->displayUrl() + : Avatar::defaultImage(AVATAR_MINI_SIZE), + 'class' => 'avatar photo question-avatar', + 'width' => AVATAR_MINI_SIZE, + 'height' => AVATAR_MINI_SIZE, + 'alt' => $profile->getBestName() + ) + ); + + $out->raw(' '); // avoid   for AJAX XML compatibility + + // hack for belongsOnTimeline; JS needs to be able to find the author + $out->elementStart('span', 'vcard author'); + $out->element( + 'a', + array( + 'class' => 'url', + 'href' => $profile->profileurl, + 'title' => $profile->getBestName() + ), + $profile->nickname + ); + + $out->elementEnd('span'); + } + + function showAnswerNotice($notice, $out) + { + $answer = QnA_Answer::fromNotice($notice); + + assert(!empty($answer)); + + $out->elementStart('div', 'answer'); + $out->raw($answer->asHTML()); + $out->elementEnd('div'); + } + + function showQuestionNotice($notice, $out) + { + $profile = $notice->getProfile(); + $question = QnA_Question::fromNotice($notice); + + assert(!empty($question)); + assert(!empty($profile)); + + $out->elementStart('div', 'question-notice'); + + $out->elementStart('h3'); + + if (!empty($question->url)) { + $out->element( + 'a', + array( + 'href' => $question->url, + 'class' => 'question-title' + ), + $question->title + ); + } else { + $out->text($question->title); + } + + if (!empty($question->location)) { + $out->elementStart('div', 'question-location'); + $out->element('strong', null, _('Location: ')); + $out->element('span', 'location', $question->location); + $out->elementEnd('div'); + } + + if (!empty($question->description)) { + $out->elementStart('div', 'question-description'); + $out->element('strong', null, _('Description: ')); + $out->element('span', 'description', $question->description); + $out->elementEnd('div'); + } + + //$answers = $question->getAnswers(); + + $out->elementStart('div', 'question-answers'); + $out->element('strong', null, _('Answer: ')); + $out->element('span', 'question-answer'); + + $out->elementEnd('div'); + + $user = common_current_user(); + + if (!empty($user)) { + + $answer = $question->getAnswer($user->getProfile()); + + if (empty($answer)) { + $form = new QnaanswerForm($question, $out); + $form->show(); + } + + + } + + $out->elementEnd('div'); + } + + /** + * Form for our app + * + * @param HTMLOutputter $out + * @return Widget + */ + + function entryForm($out) + { + return new QnaquestionForm($out); + } + + /** + * When a notice is deleted, clean up related tables. + * + * @param Notice $notice + */ + + function deleteRelated($notice) + { + switch ($notice->object_type) { + case QnA_Question::OBJECT_TYPE: + common_log(LOG_DEBUG, "Deleting question from notice..."); + $question = QnA_Question::fromNotice($notice); + $question->delete(); + break; + case QnA_Answer::OBJECT_TYPE: + common_log(LOG_DEBUG, "Deleting answer from notice..."); + $answer = QnA_Answer::fromNotice($notice); + common_log(LOG_DEBUG, "to delete: $answer->id"); + $answer->delete(); + break; + default: + common_log(LOG_DEBUG, "Not deleting related, wtf..."); + } + } + + function onEndShowScripts($action) + { + // XXX maybe some cool shiz here + } + + function onEndShowStyles($action) + { + $action->cssLink($this->path('css/qna.css')); + return true; + } +} diff --git a/plugins/QnA/actions/answer.php b/plugins/QnA/actions/answer.php deleted file mode 100644 index 17e841e545..0000000000 --- a/plugins/QnA/actions/answer.php +++ /dev/null @@ -1,198 +0,0 @@ -. - * - * @category QuestonAndAnswer - * @package StatusNet - * @author Zach Copley - * @copyright 2011 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 - * @link http://status.net/ - */ -if (!defined('STATUSNET')) { - // This check helps protect against security problems; - // your code file can't be executed directly from the web. - exit(1); -} - -/** - * Answer a question - * - * @category QnA - * @package StatusNet - * @author Zach Copley - * @copyright 2010 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 - * @link http://status.net/ - */ -class AnswerAction extends Action -{ - protected $user = null; - protected $error = null; - protected $complete = null; - - protected $qustion = null; - protected $answer = null; - - /** - * Returns the title of the action - * - * @return string Action title - */ - function title() - { - // TRANS: Page title for and answer to a question. - return _m('Answer'); - } - - /** - * For initializing members of the class. - * - * @param array $argarray misc. arguments - * - * @return boolean true - */ - function prepare($argarray) - { - parent::prepare($argarray); - if ($this->boolean('ajax')) { - StatusNet::setApi(true); - } - - $this->user = common_current_user(); - - if (empty($this->user)) { - // TRANS: Client exception thrown trying to answer a question while not logged in. - throw new ClientException(_m("You must be logged in to answer to a question."), - 403); - } - - if ($this->isPost()) { - $this->checkSessionToken(); - } - - $id = $this->trimmed('id'); - $this->question = Question::staticGet('id', $id); - if (empty($this->question)) { - // TRANS: Client exception thrown trying to respond to a non-existing question. - throw new ClientException(_m('Invalid or missing question.'), 404); - } - - $answer = $this->trimmed('answer'); - - - return true; - } - - /** - * Handler method - * - * @param array $argarray is ignored since it's now passed in in prepare() - * - * @return void - */ - function handle($argarray=null) - { - parent::handle($argarray); - - if ($this->isPost()) { - $this->answer(); - } else { - $this->showPage(); - } - - return; - } - - /** - * Add a new answer - * - * @return void - */ - function answer() - { - try { - $notice = Answer::saveNew( - $this->user->getProfile(), - $this->question, - $this->answer - ); - } catch (ClientException $ce) { - $this->error = $ce->getMessage(); - $this->showPage(); - return; - } - - if ($this->boolean('ajax')) { - header('Content-Type: text/xml;charset=utf-8'); - $this->xw->startDocument('1.0', 'UTF-8'); - $this->elementStart('html'); - $this->elementStart('head'); - // TRANS: Page title after sending an answer. - $this->element('title', null, _m('Answers')); - $this->elementEnd('head'); - $this->elementStart('body'); - $form = new Answer($this->question, $this); - $form->show(); - $this->elementEnd('body'); - $this->elementEnd('html'); - } else { - common_redirect($this->question->bestUrl(), 303); - } - } - - /** - * Show the Answer form - * - * @return void - */ - function showContent() - { - if (!empty($this->error)) { - $this->element('p', 'error', $this->error); - } - - $form = new AnswerForm($this->question, $this); - - $form->show(); - - return; - } - - /** - * Return true if read only. - * - * MAY override - * - * @param array $args other arguments - * - * @return boolean is read only action? - */ - function isReadOnly($args) - { - if ($_SERVER['REQUEST_METHOD'] == 'GET' || - $_SERVER['REQUEST_METHOD'] == 'HEAD') { - return true; - } else { - return false; - } - } -} diff --git a/plugins/QnA/actions/newquestion.php b/plugins/QnA/actions/newquestion.php deleted file mode 100644 index 0a486dfa43..0000000000 --- a/plugins/QnA/actions/newquestion.php +++ /dev/null @@ -1,216 +0,0 @@ -. - * - * @category QnA - * @package StatusNet - * @author Zach Copley - * @copyright 2011 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 - * @link http://status.net/ - */ -if (!defined('STATUSNET')) { - // This check helps protect against security problems; - // your code file can't be executed directly from the web. - exit(1); -} - -/** - * Add a new Question - * - * @category Plugin - * @package StatusNet - * @author Zach Copley - * @copyright 2010 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 - * @link http://status.net/ - */ -class NewquestionAction extends Action -{ - protected $user = null; - protected $error = null; - protected $complete = null; - protected $title = null; - protected $description = null; - - /** - * Returns the title of the action - * - * @return string Action title - */ - function title() - { - // TRANS: Title for Question page. - return _m('New question'); - } - - /** - * For initializing members of the class. - * - * @param array $argarray misc. arguments - * - * @return boolean true - */ - function prepare($argarray) - { - parent::prepare($argarray); - - $this->user = common_current_user(); - - if (empty($this->user)) { - // TRANS: Client exception thrown trying to create a Question while not logged in. - throw new ClientException( - _m('You must be logged in to post a question.'), - 403 - ); - } - - if ($this->isPost()) { - $this->checkSessionToken(); - } - - $this->title = $this->trimmed('title'); - $this->description = $this->trimmed('description'); - - return true; - } - - /** - * Handler method - * - * @param array $argarray is ignored since it's now passed in in prepare() - * - * @return void - */ - function handle($argarray=null) - { - parent::handle($argarray); - - if ($this->isPost()) { - $this->newQuestion(); - } else { - $this->showPage(); - } - - return; - } - - /** - * Add a new Question - * - * @return void - */ - function newQuestion() - { - if ($this->boolean('ajax')) { - StatusNet::setApi(true); - } - try { - if (empty($this->title)) { - // TRANS: Client exception thrown trying to create a question without a title. - throw new ClientException(_m('Question must have a title.')); - } - - $saved = QnA_Question::saveNew( - $this->user->getProfile(), - $this->title, - $this->description - ); - } catch (ClientException $ce) { - $this->error = $ce->getMessage(); - $this->showPage(); - return; - } - - if ($this->boolean('ajax')) { - header('Content-Type: text/xml;charset=utf-8'); - $this->xw->startDocument('1.0', 'UTF-8'); - $this->elementStart('html'); - $this->elementStart('head'); - // TRANS: Page title after sending a notice. - $this->element('title', null, _m('Question posted')); - $this->elementEnd('head'); - $this->elementStart('body'); - $this->showNotice($saved); - $this->elementEnd('body'); - $this->elementEnd('html'); - } else { - common_redirect($saved->bestUrl(), 303); - } - } - - /** - * Output a notice - * - * Used to generate the notice code for Ajax results. - * - * @param Notice $notice Notice that was saved - * - * @return void - */ - function showNotice($notice) - { - class_exists('NoticeList'); // @fixme hack for autoloader - $nli = new NoticeListItem($notice, $this); - $nli->show(); - } - - /** - * Show the Question form - * - * @return void - */ - function showContent() - { - if (!empty($this->error)) { - $this->element('p', 'error', $this->error); - } - - $form = new QuestionForm( - $this, - $this->title, - $this->description - ); - - $form->show(); - - return; - } - - /** - * Return true if read only. - * - * MAY override - * - * @param array $args other arguments - * - * @return boolean is read only action? - */ - function isReadOnly($args) - { - if ($_SERVER['REQUEST_METHOD'] == 'GET' || - $_SERVER['REQUEST_METHOD'] == 'HEAD') { - return true; - } else { - return false; - } - } -} diff --git a/plugins/QnA/actions/qnanewanswer.php b/plugins/QnA/actions/qnanewanswer.php new file mode 100644 index 0000000000..10b1046c3e --- /dev/null +++ b/plugins/QnA/actions/qnanewanswer.php @@ -0,0 +1,203 @@ +. + * + * @category QuestonAndAnswer + * @package StatusNet + * @author Zach Copley + * @copyright 2011 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ +if (!defined('STATUSNET')) { + // This check helps protect against security problems; + // your code file can't be executed directly from the web. + exit(1); +} + +/** + * Answer a question + * + * @category QnA + * @package StatusNet + * @author Zach Copley + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ +class QnanewanswerAction extends Action +{ + protected $user = null; + protected $error = null; + protected $complete = null; + + protected $question = null; + protected $answerText = null; + + /** + * Returns the title of the action + * + * @return string Action title + */ + function title() + { + // TRANS: Page title for and answer to a question. + return _m('Answer'); + } + + /** + * For initializing members of the class. + * + * @param array $argarray misc. arguments + * + * @return boolean true + */ + function prepare($argarray) + { + parent::prepare($argarray); + if ($this->boolean('ajax')) { + StatusNet::setApi(true); + } + + $this->user = common_current_user(); + + if (empty($this->user)) { + // TRANS: Client exception thrown trying to answer a question while not logged in. + throw new ClientException( + _m("You must be logged in to answer to a question."), + 403 + ); + } + + if ($this->isPost()) { + $this->checkSessionToken(); + } + + $id = $this->trimmed('id'); + $this->question = QnA_Question::staticGet('id', $id); + + if (empty($this->question)) { + // TRANS: Client exception thrown trying to respond to a non-existing question. + throw new ClientException( + _m('Invalid or missing question.'), + 404 + ); + } + + $this->answerText = $this->trimmed('answer'); + + return true; + } + + /** + * Handler method + * + * @param array $argarray is ignored since it's now passed in in prepare() + * + * @return void + */ + function handle($argarray=null) + { + parent::handle($argarray); + + if ($this->isPost()) { + $this->newAnswer(); + } else { + $this->showPage(); + } + + return; + } + + /** + * Add a new answer + * + * @return void + */ + function newAnswer() + { + try { + $notice = QnA_Answer::saveNew( + $this->user->getProfile(), + $this->question, + $this->answerText + ); + } catch (ClientException $ce) { + $this->error = $ce->getMessage(); + $this->showPage(); + return; + } + + if ($this->boolean('ajax')) { + header('Content-Type: text/xml;charset=utf-8'); + $this->xw->startDocument('1.0', 'UTF-8'); + $this->elementStart('html'); + $this->elementStart('head'); + // TRANS: Page title after sending an answer. + $this->element('title', null, _m('Answers')); + $this->elementEnd('head'); + $this->elementStart('body'); + $form = new QnA_Answer($this->question, $this); + $form->show(); + $this->elementEnd('body'); + $this->elementEnd('html'); + } else { + common_redirect($this->question->bestUrl(), 303); + } + } + + /** + * Show the Answer form + * + * @return void + */ + function showContent() + { + if (!empty($this->error)) { + $this->element('p', 'error', $this->error); + } + + $form = new QnaanswerForm($this->question, $this); + + $form->show(); + + return; + } + + /** + * Return true if read only. + * + * MAY override + * + * @param array $args other arguments + * + * @return boolean is read only action? + */ + function isReadOnly($args) + { + if ($_SERVER['REQUEST_METHOD'] == 'GET' || + $_SERVER['REQUEST_METHOD'] == 'HEAD') { + return true; + } else { + return false; + } + } +} diff --git a/plugins/QnA/actions/qnanewquestion.php b/plugins/QnA/actions/qnanewquestion.php new file mode 100644 index 0000000000..8682f8dd47 --- /dev/null +++ b/plugins/QnA/actions/qnanewquestion.php @@ -0,0 +1,216 @@ +. + * + * @category QnA + * @package StatusNet + * @author Zach Copley + * @copyright 2011 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ +if (!defined('STATUSNET')) { + // This check helps protect against security problems; + // your code file can't be executed directly from the web. + exit(1); +} + +/** + * Add a new Question + * + * @category Plugin + * @package StatusNet + * @author Zach Copley + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ +class QnanewquestionAction extends Action +{ + protected $user = null; + protected $error = null; + protected $complete = null; + protected $title = null; + protected $description = null; + + /** + * Returns the title of the action + * + * @return string Action title + */ + function title() + { + // TRANS: Title for Question page. + return _m('New question'); + } + + /** + * For initializing members of the class. + * + * @param array $argarray misc. arguments + * + * @return boolean true + */ + function prepare($argarray) + { + parent::prepare($argarray); + + $this->user = common_current_user(); + + if (empty($this->user)) { + // TRANS: Client exception thrown trying to create a Question while not logged in. + throw new ClientException( + _m('You must be logged in to post a question.'), + 403 + ); + } + + if ($this->isPost()) { + $this->checkSessionToken(); + } + + $this->title = $this->trimmed('title'); + $this->description = $this->trimmed('description'); + + return true; + } + + /** + * Handler method + * + * @param array $argarray is ignored since it's now passed in in prepare() + * + * @return void + */ + function handle($argarray=null) + { + parent::handle($argarray); + + if ($this->isPost()) { + $this->newQuestion(); + } else { + $this->showPage(); + } + + return; + } + + /** + * Add a new Question + * + * @return void + */ + function newQuestion() + { + if ($this->boolean('ajax')) { + StatusNet::setApi(true); + } + try { + if (empty($this->title)) { + // TRANS: Client exception thrown trying to create a question without a title. + throw new ClientException(_m('Question must have a title.')); + } + + $saved = QnA_Question::saveNew( + $this->user->getProfile(), + $this->title, + $this->description + ); + } catch (ClientException $ce) { + $this->error = $ce->getMessage(); + $this->showPage(); + return; + } + + if ($this->boolean('ajax')) { + header('Content-Type: text/xml;charset=utf-8'); + $this->xw->startDocument('1.0', 'UTF-8'); + $this->elementStart('html'); + $this->elementStart('head'); + // TRANS: Page title after sending a notice. + $this->element('title', null, _m('Question posted')); + $this->elementEnd('head'); + $this->elementStart('body'); + $this->showNotice($saved); + $this->elementEnd('body'); + $this->elementEnd('html'); + } else { + common_redirect($saved->bestUrl(), 303); + } + } + + /** + * Output a notice + * + * Used to generate the notice code for Ajax results. + * + * @param Notice $notice Notice that was saved + * + * @return void + */ + function showNotice($notice) + { + class_exists('NoticeList'); // @fixme hack for autoloader + $nli = new NoticeListItem($notice, $this); + $nli->show(); + } + + /** + * Show the Question form + * + * @return void + */ + function showContent() + { + if (!empty($this->error)) { + $this->element('p', 'error', $this->error); + } + + $form = new QuestionForm( + $this, + $this->title, + $this->description + ); + + $form->show(); + + return; + } + + /** + * Return true if read only. + * + * MAY override + * + * @param array $args other arguments + * + * @return boolean is read only action? + */ + function isReadOnly($args) + { + if ($_SERVER['REQUEST_METHOD'] == 'GET' || + $_SERVER['REQUEST_METHOD'] == 'HEAD') { + return true; + } else { + return false; + } + } +} diff --git a/plugins/QnA/actions/qnashowanswer.php b/plugins/QnA/actions/qnashowanswer.php new file mode 100644 index 0000000000..68baadfba8 --- /dev/null +++ b/plugins/QnA/actions/qnashowanswer.php @@ -0,0 +1,125 @@ +. + * + * @category QnA + * @package StatusNet + * @author Zach Copley + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + // This check helps protect against security problems; + // your code file can't be executed directly from the web. + exit(1); +} + +/** + * Show an answer to a question, and associated data + * + * @category QnA + * @package StatusNet + * @author Zach Copley + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ + +class QnashowanswerAction extends ShownoticeAction +{ + protected $answer = null; + + /** + * For initializing members of the class. + * + * @param array $argarray misc. arguments + * + * @return boolean true + */ + + function prepare($argarray) + { + OwnerDesignAction::prepare($argarray); + + $this->id = $this->trimmed('id'); + + $this->answer = Answer::staticGet('id', $this->id); + + if (empty($this->answer)) { + throw new ClientException(_('No such answer.'), 404); + } + + $this->notice = Notice::staticGet('uri', $this->answer->uri); + + if (empty($this->notice)) { + // Did we used to have it, and it got deleted? + throw new ClientException(_('No such answer.'), 404); + } + + $this->user = User::staticGet('id', $this->answer->profile_id); + + if (empty($this->user)) { + throw new ClientException(_('No such user.'), 404); + } + + $this->profile = $this->user->getProfile(); + + if (empty($this->profile)) { + throw new ServerException(_('User without a profile.')); + } + + $this->avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE); + + return true; + } + + /** + * Title of the page + * + * Used by Action class for layout. + * + * @return string page tile + */ + + function title() + { + return sprintf(_('%s\'s answer to "%s"'), + $this->user->nickname, + $this->answer->title); + } + + /** + * Overload page title display to show answer link + * + * @return void + */ + + function showPageTitle() + { + $this->elementStart('h1'); + $this->element('a', + array('href' => $this->answer->url), + $this->asnwer->title); + $this->elementEnd('h1'); + } +} diff --git a/plugins/QnA/actions/qnashowquestion.php b/plugins/QnA/actions/qnashowquestion.php new file mode 100644 index 0000000000..e563753a01 --- /dev/null +++ b/plugins/QnA/actions/qnashowquestion.php @@ -0,0 +1,130 @@ +. + * + * @category QnA + * @package StatusNet + * @author Zach Copley + * @copyright 2011 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + // This check helps protect against security problems; + // your code file can't be executed directly from the web. + exit(1); +} + +/** + * Show a question + * + * @category QnA + * @package StatusNet + * @author Zach Copley + * @copyright 2011 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ +class QnashowquestionAction extends ShownoticeAction +{ + protected $question = null; + + /** + * For initializing members of the class. + * + * @param array $argarray misc. arguments + * + * @return boolean true + */ + function prepare($argarray) + { + OwnerDesignAction::prepare($argarray); + + $this->id = $this->trimmed('id'); + + $this->question = Question::staticGet('id', $this->id); + + if (empty($this->question)) { + // TRANS: Client exception thrown trying to view a non-existing question. + throw new ClientException(_m('No such question.'), 404); + } + + $this->notice = $this->question->getNotice(); + + if (empty($this->notice)) { + // Did we used to have it, and it got deleted? + // TRANS: Client exception thrown trying to view a non-existing question notice. + throw new ClientException(_m('No such question notice.'), 404); + } + + $this->user = User::staticGet('id', $this->question->profile_id); + + if (empty($this->user)) { + // TRANS: Client exception thrown trying to view a question of a non-existing user. + throw new ClientException(_m('No such user.'), 404); + } + + $this->profile = $this->user->getProfile(); + + if (empty($this->profile)) { + // TRANS: Server exception thrown trying to view a question for a user for which the profile could not be loaded. + throw new ServerException(_m('User without a profile.')); + } + + $this->avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE); + + return true; + } + + /** + * Title of the page + * + * Used by Action class for layout. + * + * @return string page tile + */ + function title() + { + // TRANS: Page title for a question. + // TRANS: %1$s is the nickname of the user who asked the question, %2$s is the question. + return sprintf(_m('%1$s\'s question: %2$s'), + $this->user->nickname, + $this->question->question); + } + + /** + * @fixme combine the notice time with question update time + */ + function lastModified() + { + return Action::lastModified(); + } + + + /** + * @fixme combine the notice time with question update time + */ + function etag() + { + return Action::etag(); + } +} diff --git a/plugins/QnA/actions/qnavote.php b/plugins/QnA/actions/qnavote.php index 6c1b9f053e..94aec41c5b 100644 --- a/plugins/QnA/actions/qnavote.php +++ b/plugins/QnA/actions/qnavote.php @@ -150,7 +150,7 @@ class Qnavote extends Action $this->element('title', null, _m('Answers')); $this->elementEnd('head'); $this->elementStart('body'); - $form = new Answer($this->question, $this); + $form = new QnA_Answer($this->question, $this); $form->show(); $this->elementEnd('body'); $this->elementEnd('html'); @@ -170,7 +170,7 @@ class Qnavote extends Action $this->element('p', 'error', $this->error); } - $form = new AnswerForm($this->question, $this); + $form = new QnaanswerForm($this->question, $this); $form->show(); diff --git a/plugins/QnA/actions/showanswer.php b/plugins/QnA/actions/showanswer.php deleted file mode 100644 index 7686d6d566..0000000000 --- a/plugins/QnA/actions/showanswer.php +++ /dev/null @@ -1,125 +0,0 @@ -. - * - * @category QnA - * @package StatusNet - * @author Zach Copley - * @copyright 2010 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 - * @link http://status.net/ - */ - -if (!defined('STATUSNET')) { - // This check helps protect against security problems; - // your code file can't be executed directly from the web. - exit(1); -} - -/** - * Show an answer to a question, and associated data - * - * @category QnA - * @package StatusNet - * @author Zach Copley - * @copyright 2010 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 - * @link http://status.net/ - */ - -class ShowAnswerAction extends ShownoticeAction -{ - protected $answer = null; - - /** - * For initializing members of the class. - * - * @param array $argarray misc. arguments - * - * @return boolean true - */ - - function prepare($argarray) - { - OwnerDesignAction::prepare($argarray); - - $this->id = $this->trimmed('id'); - - $this->answer = Answer::staticGet('id', $this->id); - - if (empty($this->answer)) { - throw new ClientException(_('No such answer.'), 404); - } - - $this->notice = Notice::staticGet('uri', $this->answer->uri); - - if (empty($this->notice)) { - // Did we used to have it, and it got deleted? - throw new ClientException(_('No such answer.'), 404); - } - - $this->user = User::staticGet('id', $this->answer->profile_id); - - if (empty($this->user)) { - throw new ClientException(_('No such user.'), 404); - } - - $this->profile = $this->user->getProfile(); - - if (empty($this->profile)) { - throw new ServerException(_('User without a profile.')); - } - - $this->avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE); - - return true; - } - - /** - * Title of the page - * - * Used by Action class for layout. - * - * @return string page tile - */ - - function title() - { - return sprintf(_('%s\'s answer to "%s"'), - $this->user->nickname, - $this->answer->title); - } - - /** - * Overload page title display to show answer link - * - * @return void - */ - - function showPageTitle() - { - $this->elementStart('h1'); - $this->element('a', - array('href' => $this->answer->url), - $this->asnwer->title); - $this->elementEnd('h1'); - } -} diff --git a/plugins/QnA/actions/showquestion.php b/plugins/QnA/actions/showquestion.php deleted file mode 100644 index 41c1d809fe..0000000000 --- a/plugins/QnA/actions/showquestion.php +++ /dev/null @@ -1,130 +0,0 @@ -. - * - * @category QnA - * @package StatusNet - * @author Zach Copley - * @copyright 2011 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 - * @link http://status.net/ - */ - -if (!defined('STATUSNET')) { - // This check helps protect against security problems; - // your code file can't be executed directly from the web. - exit(1); -} - -/** - * Show a question - * - * @category QnA - * @package StatusNet - * @author Zach Copley - * @copyright 2011 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 - * @link http://status.net/ - */ -class ShowquestionAction extends ShownoticeAction -{ - protected $question = null; - - /** - * For initializing members of the class. - * - * @param array $argarray misc. arguments - * - * @return boolean true - */ - function prepare($argarray) - { - OwnerDesignAction::prepare($argarray); - - $this->id = $this->trimmed('id'); - - $this->question = Question::staticGet('id', $this->id); - - if (empty($this->question)) { - // TRANS: Client exception thrown trying to view a non-existing question. - throw new ClientException(_m('No such question.'), 404); - } - - $this->notice = $this->question->getNotice(); - - if (empty($this->notice)) { - // Did we used to have it, and it got deleted? - // TRANS: Client exception thrown trying to view a non-existing question notice. - throw new ClientException(_m('No such question notice.'), 404); - } - - $this->user = User::staticGet('id', $this->question->profile_id); - - if (empty($this->user)) { - // TRANS: Client exception thrown trying to view a question of a non-existing user. - throw new ClientException(_m('No such user.'), 404); - } - - $this->profile = $this->user->getProfile(); - - if (empty($this->profile)) { - // TRANS: Server exception thrown trying to view a question for a user for which the profile could not be loaded. - throw new ServerException(_m('User without a profile.')); - } - - $this->avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE); - - return true; - } - - /** - * Title of the page - * - * Used by Action class for layout. - * - * @return string page tile - */ - function title() - { - // TRANS: Page title for a question. - // TRANS: %1$s is the nickname of the user who asked the question, %2$s is the question. - return sprintf(_m('%1$s\'s question: %2$s'), - $this->user->nickname, - $this->question->question); - } - - /** - * @fixme combine the notice time with question update time - */ - function lastModified() - { - return Action::lastModified(); - } - - - /** - * @fixme combine the notice time with question update time - */ - function etag() - { - return Action::etag(); - } -} diff --git a/plugins/QnA/classes/QnA_Answer.php b/plugins/QnA/classes/QnA_Answer.php index 102af70057..ff11ff8f14 100644 --- a/plugins/QnA/classes/QnA_Answer.php +++ b/plugins/QnA/classes/QnA_Answer.php @@ -45,7 +45,7 @@ if (!defined('STATUSNET')) { class QnA_Answer extends Managed_DataObject { const OBJECT_TYPE = 'http://activityschema.org/object/answer'; - + public $__table = 'qna_answer'; // table name public $id; // char(36) primary key not null -> UUID public $question_id; // char(36) -> question.id UUID @@ -95,19 +95,19 @@ class QnA_Answer extends Managed_DataObject 'description' => 'Record of answers to questions', 'fields' => array( 'id' => array( - 'type' => 'char', - 'length' => 36, + 'type' => 'char', + 'length' => 36, 'not null' => true, 'description' => 'UUID of the response'), 'uri' => array( - 'type' => 'varchar', - 'length' => 255, - 'not null' => true, + 'type' => 'varchar', + 'length' => 255, + 'not null' => true, 'description' => 'UUID to the answer notice' ), 'question_id' => array( - 'type' => 'char', - 'length' => 36, - 'not null' => true, + 'type' => 'char', + 'length' => 36, + 'not null' => true, 'description' => 'UUID of question being responded to' ), 'best' => array('type' => 'int', 'size' => 'tiny'), @@ -164,7 +164,7 @@ class QnA_Answer extends Managed_DataObject static function fromNotice($notice) { - return QnA_Answer::staticGet('uri', $notice->uri); + return self::staticGet('uri', $notice->uri); } /** @@ -182,7 +182,7 @@ class QnA_Answer extends Managed_DataObject $options = array(); } - $answer = new Answer(); + $answer = new QnA_Answer(); $answer->id = UUID::gen(); $answer->profile_id = $profile->id; $answer->question_id = $question->id; @@ -191,7 +191,7 @@ class QnA_Answer extends Managed_DataObject 'showanswer', array('id' => $answer->id) ); - + common_log(LOG_DEBUG, "Saving answer: $answer->id, $answer->uri"); $answer->insert(); @@ -201,6 +201,7 @@ class QnA_Answer extends Managed_DataObject _m('answered "%s"'), $answer->uri ); + $link = '' . htmlspecialchars($answer) . ''; // TRANS: Rendered version of the notice content answering a question. // TRANS: %s a link to the question with question title as the link content. diff --git a/plugins/QnA/lib/answerform.php b/plugins/QnA/lib/answerform.php deleted file mode 100644 index d4f28bb6d2..0000000000 --- a/plugins/QnA/lib/answerform.php +++ /dev/null @@ -1,121 +0,0 @@ -. - * - * @category QnA - * @package StatusNet - * @author Zach Copley - * @copyright 2011 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 - * @link http://status.net/ - */ - -if (!defined('STATUSNET')) { - // This check helps protect against security problems; - // your code file can't be executed directly from the web. - exit(1); -} - -/** - * Form to add a new answer to a question - * - * @category QnA - * @package StatusNet - * @author Zach Copley - * @copyright 2011 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 - * @link http://status.net/ - */ -class AnswerForm extends Form -{ - protected $question; - - /** - * Construct a new answer form - * - * @param QnA_Question $question - * @param HTMLOutputter $out output channel - * - * @return void - */ - function __construct(QnA_Question $question, HTMLOutputter $out) - { - parent::__construct($out); - $this->question = $question; - } - - /** - * ID of the form - * - * @return int ID of the form - */ - function id() - { - return 'answer-form'; - } - - /** - * class of the form - * - * @return string class of the form - */ - function formClass() - { - return 'form_settings ajax'; - } - - /** - * Action of the form - * - * @return string URL of the action - */ - function action() - { - return common_local_url('answer', array('id' => $this->question->id)); - } - - /** - * Data elements of the form - * - * @return void - */ - function formData() - { - $question = $this->question; - $out = $this->out; - $id = "question-" . $question->id; - - $out->element('p', 'answer', $question->title); - $out->element('input', array('type' => 'text', 'name' => 'answer')); - } - - /** - * Action elements - * - * @return void - */ - function formActions() - { - // TRANS: Button text for submitting a poll response. - $this->out->submit('submit', _m('BUTTON', 'Submit')); - } -} - diff --git a/plugins/QnA/lib/qnaanswerform.php b/plugins/QnA/lib/qnaanswerform.php new file mode 100644 index 0000000000..f89f6c7889 --- /dev/null +++ b/plugins/QnA/lib/qnaanswerform.php @@ -0,0 +1,121 @@ +. + * + * @category QnA + * @package StatusNet + * @author Zach Copley + * @copyright 2011 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + // This check helps protect against security problems; + // your code file can't be executed directly from the web. + exit(1); +} + +/** + * Form to add a new answer to a question + * + * @category QnA + * @package StatusNet + * @author Zach Copley + * @copyright 2011 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ +class QnaanswerForm extends Form +{ + protected $question; + + /** + * Construct a new answer form + * + * @param QnA_Question $question + * @param HTMLOutputter $out output channel + * + * @return void + */ + function __construct(QnA_Question $question, HTMLOutputter $out) + { + parent::__construct($out); + $this->question = $question; + } + + /** + * ID of the form + * + * @return int ID of the form + */ + function id() + { + return 'answer-form'; + } + + /** + * class of the form + * + * @return string class of the form + */ + function formClass() + { + return 'form_settings ajax'; + } + + /** + * Action of the form + * + * @return string URL of the action + */ + function action() + { + return common_local_url('qnanewanswer', array('id' => $this->question->id)); + } + + /** + * Data elements of the form + * + * @return void + */ + function formData() + { + $question = $this->question; + $out = $this->out; + $id = "question-" . $question->id; + + $out->element('p', 'answer', $question->title); + $out->element('input', array('type' => 'text', 'name' => 'answer')); + } + + /** + * Action elements + * + * @return void + */ + function formActions() + { + // TRANS: Button text for submitting a poll response. + $this->out->submit('submit', _m('BUTTON', 'Submit')); + } +} + diff --git a/plugins/QnA/lib/qnaquestionform.php b/plugins/QnA/lib/qnaquestionform.php new file mode 100644 index 0000000000..9d0c2aad59 --- /dev/null +++ b/plugins/QnA/lib/qnaquestionform.php @@ -0,0 +1,137 @@ +. + * + * @category QnA + * @package StatusNet + * @author Zach Copley + * @copyright 2011 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + // This check helps protect against security problems; + // your code file can't be executed directly from the web. + exit(1); +} + +/** + * Form to add a new question + * + * @category QnA + * @package StatusNet + * @author Zach Copley + * @copyright 2011 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ +class QnaquestionForm extends Form +{ + protected $title; + protected $description; + + /** + * Construct a new question form + * + * @param HTMLOutputter $out output channel + * + * @return void + */ + function __construct($out = null, $title = null, $description = null, $options = null) + { + parent::__construct($out); + $this->title = $title; + $this->description = $description; + } + + /** + * ID of the form + * + * @return int ID of the form + */ + function id() + { + return 'newquestion-form'; + } + + /** + * class of the form + * + * @return string class of the form + */ + function formClass() + { + return 'form_settings ajax-notice'; + } + + /** + * Action of the form + * + * @return string URL of the action + */ + function action() + { + return common_local_url('qnanewquestion'); + } + + /** + * Data elements of the form + * + * @return void + */ + function formData() + { + $this->out->elementStart('fieldset', array('id' => 'newquestion-data')); + $this->out->elementStart('ul', 'form_data'); + + $this->li(); + $this->out->input( + 'title', + _m('Title'), + $this->title, + _m('Title of your question') + ); + $this->unli(); + $this->li(); + $this->out->textarea( + 'description', + _m('Description'), + $this->description, + _m('Your question in detail') + ); + $this->unli(); + + $this->out->elementEnd('ul'); + $this->out->elementEnd('fieldset'); + } + + /** + * Action elements + * + * @return void + */ + function formActions() + { + // TRANS: Button text for saving a new question. + $this->out->submit('submit', _m('BUTTON', 'Save')); + } +} diff --git a/plugins/QnA/lib/qnavoteform.php b/plugins/QnA/lib/qnavoteform.php new file mode 100644 index 0000000000..f6976c8834 --- /dev/null +++ b/plugins/QnA/lib/qnavoteform.php @@ -0,0 +1,121 @@ +. + * + * @category QnA + * @package StatusNet + * @author Zach Copley + * @copyright 2011 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + // This check helps protect against security problems; + // your code file can't be executed directly from the web. + exit(1); +} + +/** + * Form to add a new answer to a question + * + * @category QnA + * @package StatusNet + * @author Zach Copley + * @copyright 2011 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ +class QnavoteForm extends Form +{ + protected $question; + + /** + * Construct a new answer form + * + * @param QnA_Question $question + * @param HTMLOutputter $out output channel + * + * @return void + */ + function __construct(QnA_Question $question, HTMLOutputter $out) + { + parent::__construct($out); + $this->question = $question; + } + + /** + * ID of the form + * + * @return int ID of the form + */ + function id() + { + return 'answer-form'; + } + + /** + * class of the form + * + * @return string class of the form + */ + function formClass() + { + return 'form_settings ajax'; + } + + /** + * Action of the form + * + * @return string URL of the action + */ + function action() + { + return common_local_url('qnavote', array('id' => $this->question->id)); + } + + /** + * Data elements of the form + * + * @return void + */ + function formData() + { + $question = $this->question; + $out = $this->out; + $id = "question-" . $question->id; + + $out->element('p', 'answer', $question->question); + $out->element('input', array('type' => 'text', 'name' => 'vote')); + } + + /** + * Action elements + * + * @return void + */ + function formActions() + { + // TRANS: Button text for submitting a poll response. + $this->out->submit('submit', _m('BUTTON', 'Submit')); + } +} + diff --git a/plugins/QnA/lib/questionform.php b/plugins/QnA/lib/questionform.php deleted file mode 100644 index a26bbb17be..0000000000 --- a/plugins/QnA/lib/questionform.php +++ /dev/null @@ -1,137 +0,0 @@ -. - * - * @category QnA - * @package StatusNet - * @author Zach Copley - * @copyright 2011 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 - * @link http://status.net/ - */ - -if (!defined('STATUSNET')) { - // This check helps protect against security problems; - // your code file can't be executed directly from the web. - exit(1); -} - -/** - * Form to add a new question - * - * @category QnA - * @package StatusNet - * @author Zach Copley - * @copyright 2011 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 - * @link http://status.net/ - */ -class QuestionForm extends Form -{ - protected $title; - protected $description; - - /** - * Construct a new question form - * - * @param HTMLOutputter $out output channel - * - * @return void - */ - function __construct($out = null, $title = null, $description = null, $options = null) - { - parent::__construct($out); - $this->title = $title; - $this->description = $description; - } - - /** - * ID of the form - * - * @return int ID of the form - */ - function id() - { - return 'newquestion-form'; - } - - /** - * class of the form - * - * @return string class of the form - */ - function formClass() - { - return 'form_settings ajax-notice'; - } - - /** - * Action of the form - * - * @return string URL of the action - */ - function action() - { - return common_local_url('newquestion'); - } - - /** - * Data elements of the form - * - * @return void - */ - function formData() - { - $this->out->elementStart('fieldset', array('id' => 'newquestion-data')); - $this->out->elementStart('ul', 'form_data'); - - $this->li(); - $this->out->input( - 'title', - _m('Title'), - $this->title, - _m('Title of your question') - ); - $this->unli(); - $this->li(); - $this->out->textarea( - 'description', - _m('Description'), - $this->description, - _m('Your question in detail') - ); - $this->unli(); - - $this->out->elementEnd('ul'); - $this->out->elementEnd('fieldset'); - } - - /** - * Action elements - * - * @return void - */ - function formActions() - { - // TRANS: Button text for saving a new question. - $this->out->submit('submit', _m('BUTTON', 'Save')); - } -} diff --git a/plugins/QnA/lib/voteform.php b/plugins/QnA/lib/voteform.php deleted file mode 100644 index 554f698d99..0000000000 --- a/plugins/QnA/lib/voteform.php +++ /dev/null @@ -1,121 +0,0 @@ -. - * - * @category QnA - * @package StatusNet - * @author Zach Copley - * @copyright 2011 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 - * @link http://status.net/ - */ - -if (!defined('STATUSNET')) { - // This check helps protect against security problems; - // your code file can't be executed directly from the web. - exit(1); -} - -/** - * Form to add a new answer to a question - * - * @category QnA - * @package StatusNet - * @author Zach Copley - * @copyright 2011 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 - * @link http://status.net/ - */ -class AnswerForm extends Form -{ - protected $question; - - /** - * Construct a new answer form - * - * @param QnA_Question $question - * @param HTMLOutputter $out output channel - * - * @return void - */ - function __construct(QnA_Question $question, HTMLOutputter $out) - { - parent::__construct($out); - $this->question = $question; - } - - /** - * ID of the form - * - * @return int ID of the form - */ - function id() - { - return 'answer-form'; - } - - /** - * class of the form - * - * @return string class of the form - */ - function formClass() - { - return 'form_settings ajax'; - } - - /** - * Action of the form - * - * @return string URL of the action - */ - function action() - { - return common_local_url('answer', array('id' => $this->question->id)); - } - - /** - * Data elements of the form - * - * @return void - */ - function formData() - { - $question = $this->question; - $out = $this->out; - $id = "question-" . $question->id; - - $out->element('p', 'answer', $question->question); - $out->element('input', array('type' => 'text', 'name' => 'answer')); - } - - /** - * Action elements - * - * @return void - */ - function formActions() - { - // TRANS: Button text for submitting a poll response. - $this->out->submit('submit', _m('BUTTON', 'Submit')); - } -} -