X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FQnA%2FQnAPlugin.php;h=7c6c3e00e355fd6367c604ba64be127d71b063da;hb=f2bfcdc2c1d7bc4634bb06285380884a57075759;hp=c62eefa6716362eb88fadd4a06d5a1e8518a56f8;hpb=57198a74647f8350db4de03b0b7ef157091a4359;p=quix0rs-gnu-social.git diff --git a/plugins/QnA/QnAPlugin.php b/plugins/QnA/QnAPlugin.php index c62eefa671..7c6c3e00e3 100644 --- a/plugins/QnA/QnAPlugin.php +++ b/plugins/QnA/QnAPlugin.php @@ -46,6 +46,9 @@ if (!defined('STATUSNET')) { */ class QnAPlugin extends MicroAppPlugin { + + var $oldSaveNew = true; + /** * Set up our tables (question and answer) * @@ -65,54 +68,19 @@ class QnAPlugin extends MicroAppPlugin 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 'QnareviseanswerAction': - case 'QnavoteAction': - include_once $dir . '/actions/' - . strtolower(mb_substr($cls, 0, -6)) . '.php'; - return false; - case 'QnaquestionForm': - case 'QnaanswerForm': - case 'QnareviseanswerForm': - 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; - } + public function newFormAction() { + return 'qnanewquestion'; } /** * Map URLs to actions * - * @param Net_URL_Mapper $m path-to-action mapper + * @param URLMapper $m path-to-action mapper * * @return boolean hook value; true means continue processing, false means stop. */ - function onRouterInitialized($m) + public function onRouterInitialized(URLMapper $m) { $UUIDregex = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'; @@ -120,10 +88,18 @@ class QnAPlugin extends MicroAppPlugin 'main/qna/newquestion', array('action' => 'qnanewquestion') ); + $m->connect( + 'answer/qna/closequestion', + array('action' => 'qnaclosequestion') + ); $m->connect( 'main/qna/newanswer', array('action' => 'qnanewanswer') ); + $m->connect( + 'main/qna/reviseanswer', + array('action' => 'qnareviseanswer') + ); $m->connect( 'question/vote/:id', array('action' => 'qnavote', 'type' => 'question'), @@ -148,21 +124,23 @@ class QnAPlugin extends MicroAppPlugin return true; } - function onPluginVersion(&$versions) + function onPluginVersion(array &$versions) { $versions[] = array( 'name' => 'QnA', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Zach Copley', 'homepage' => 'http://status.net/wiki/Plugin:QnA', 'description' => + // TRANS: Plugin description. _m('Question and Answers micro-app.') ); return true; } function appTitle() { - return _m('Question'); + // TRANS: Application title. + return _m('TITLE','Question'); } function tag() { @@ -186,16 +164,18 @@ class QnAPlugin extends MicroAppPlugin * * @return Notice the resulting notice */ - function saveNoticeFromActivity($activity, $actor, $options=array()) + function saveNoticeFromActivity(Activity $activity, Profile $actor, array $options=array()) { if (count($activity->objects) != 1) { - throw new Exception('Too many activity objects.'); + // TRANS: Exception thrown when there are too many activity objects. + throw new Exception(_m('Too many activity objects.')); } $questionObj = $activity->objects[0]; - if ($questinoObj->type != QnA_Question::OBJECT_TYPE) { - throw new Exception('Wrong type for object.'); + if ($questionObj->type != QnA_Question::OBJECT_TYPE) { + // TRANS: Exception thrown when an incorrect object type is encountered. + throw new Exception(_m('Wrong type for object.')); } $notice = null; @@ -210,15 +190,17 @@ class QnAPlugin extends MicroAppPlugin ); break; case Answer::ObjectType: - $question = QnA_Question::staticGet('uri', $questionObj->id); + $question = QnA_Question::getKV('uri', $questionObj->id); if (empty($question)) { // FIXME: save the question - throw new Exception("Answer to unknown question."); + // TRANS: Exception thrown when answering a non-existing question. + throw new Exception(_m('Answer to unknown question.')); } $notice = QnA_Answer::saveNew($actor, $question, $options); break; default: - throw new Exception("Unknown object type received by QnA Plugin"); + // TRANS: Exception thrown when an object type is encountered that cannot be handled. + throw new Exception(_m('Unknown object type.')); } return $notice; @@ -232,7 +214,7 @@ class QnAPlugin extends MicroAppPlugin * @return ActivityObject */ - function activityObjectFromNotice($notice) + function activityObjectFromNotice(Notice $notice) { $question = null; @@ -247,13 +229,15 @@ class QnAPlugin extends MicroAppPlugin } if (empty($question)) { - throw new Exception("Unknown object type."); + // TRANS: Exception thrown when an object type is encountered that cannot be handled. + throw new Exception(_m('Unknown object type.')); } $notice = $question->getNotice(); if (empty($notice)) { - throw new Exception("Unknown question notice."); + // TRANS: Exception thrown when requesting a non-existing question notice. + throw new Exception(_m('Unknown question notice.')); } $obj = new ActivityObject(); @@ -261,7 +245,7 @@ class QnAPlugin extends MicroAppPlugin $obj->id = $question->uri; $obj->type = QnA_Question::OBJECT_TYPE; $obj->title = $question->title; - $obj->link = $notice->bestUrl(); + $obj->link = $notice->getUrl(); // XXX: probably need other stuff here @@ -269,90 +253,155 @@ class QnAPlugin extends MicroAppPlugin } /** - * Change the verb on Answer notices + * Output our CSS class for QnA notice list elements * - * @param Notice $notice + * @param NoticeListItem $nli The item being shown * - * @return ActivityObject + * @return boolean hook value */ - function onEndNoticeAsActivity($notice, &$act) { - switch ($notice->object_type) { - case Answer::NORMAL: - case Answer::ANONYMOUS: - $act->verb = $notice->object_type; + function onStartOpenNoticeListItemElement($nli) + { + $type = $nli->notice->object_type; + + switch($type) + { + case QnA_Question::OBJECT_TYPE: + $id = (empty($nli->repeat)) ? $nli->notice->id : $nli->repeat->id; + $class = 'h-entry notice question'; + if ($nli->notice->scope != 0 && $nli->notice->scope != 1) { + $class .= ' limited-scope'; + } + + $question = QnA_Question::getKV('uri', $nli->notice->uri); + + if (!empty($question->closed)) { + $class .= ' closed'; + } + + $nli->out->elementStart( + 'li', array( + 'class' => $class, + 'id' => 'notice-' . $id + ) + ); + Event::handle('EndOpenNoticeListItemElement', array($nli)); + return false; + break; + case QnA_Answer::OBJECT_TYPE: + $id = (empty($nli->repeat)) ? $nli->notice->id : $nli->repeat->id; + + $cls = array('h-entry', 'notice', 'answer'); + + $answer = QnA_Answer::getKV('uri', $nli->notice->uri); + + if (!empty($answer) && !empty($answer->best)) { + $cls[] = 'best'; + } + + $nli->out->elementStart( + 'li', + array( + 'class' => implode(' ', $cls), + 'id' => 'notice-' . $id + ) + ); + Event::handle('EndOpenNoticeListItemElement', array($nli)); + return false; break; + default: + return true; } + return true; } /** - * Custom HTML output for our notices + * Output the HTML for this kind of object in a list * - * @param Notice $notice - * @param HTMLOutputter $out + * @param NoticeListItem $nli The list item being shown. + * + * @return boolean hook value + * + * @todo FIXME: WARNING WARNING WARNING this closes a 'div' that is implicitly opened in BookmarkPlugin's showNotice implementation */ - function showNotice($notice, $out) + function onStartShowNoticeItem($nli) { - switch ($notice->object_type) { - case QnA_Question::OBJECT_TYPE: - return $this->showNoticeQuestion($notice, $out); - case QnA_Answer::OBJECT_TYPE: - return $this->showNoticeAnswer($notice, $out); - default: - // TRANS: Exception thrown when performing an unexpected action on a question. - // TRANS: %s is the unpexpected object type. - throw new Exception( - sprintf( - _m('Unexpected type for QnA plugin: %s.'), - $notice->object_type - ) - ); + if (!$this->isMyNotice($nli->notice)) { + return true; } - } - function showNoticeQuestion($notice, $out) - { - $user = common_current_user(); + $out = $nli->out; + $notice = $nli->notice; + + $nli->showNotice($notice, $out); - // @hack we want regular rendering, then just add stuff after that - $nli = new NoticeListItem($notice, $out); - $nli->showNotice(); + $nli->showNoticeLink(); + $nli->showNoticeSource(); + $nli->showNoticeLocation(); + $nli->showPermalink(); + $nli->showRepeat(); - $out->elementStart('div', array('class' => 'entry-content question-content')); - $question = QnA_Question::getByNotice($notice); + $nli->showNoticeOptions(); - if ($question) { - if ($user) { + if ($notice->object_type == QnA_Question::OBJECT_TYPE) { + $user = common_current_user(); + $question = QnA_Question::getByNotice($notice); + + if (!empty($user) and !empty($question)) { $profile = $user->getProfile(); $answer = $question->getAnswer($profile); - if ($answer) { - // User has already answer; show the results. - $form = new QnareviseanswerForm($answer, $out); - } else { - $form = new QnaanswerForm($question, $out); + + // Output a placeholder input -- clicking on it will + // bring up a real answer form + + // NOTE: this whole ul is just a placeholder + if (empty($question->closed) && empty($answer)) { + $out->elementStart('ul', 'notices qna-dummy'); + $out->elementStart('li', 'qna-dummy-placeholder'); + $out->element( + 'input', + array( + 'class' => 'placeholder', + // TRANS: Placeholder value for a possible answer to a question + // TRANS: by the logged in user. + 'value' => _m('Your answer...') + ) + ); + $out->elementEnd('li'); + $out->elementEnd('ul'); } - $form->show(); } - } else { - $out->text(_m('Question data is missing.')); } - $out->elementEnd('div'); - // @fixme - $out->elementStart('div', array('class' => 'entry-content')); + return false; } - function showNoticeAnswer($notice, $out) - { - $user = common_current_user(); + function adaptNoticeListItem($nli) { + return new QnAListItem($nli); + } - // @hack we want regular rendering, then just add stuff after that - $nli = new NoticeListItem($notice, $out); - $nli->showNotice(); + static function shorten($content, $notice) + { + $short = null; + + if (Notice::contentTooLong($content)) { + common_debug("content too long"); + $max = Notice::maxContent(); + // TRANS: Link description for link to full notice text if it is longer than + // TRANS: what will be dispplayed. + $ellipsis = _m('…'); + $short = mb_substr($content, 0, $max - 1); + $short .= sprintf('%3$s', + $notice->getUrl(), + // TRANS: Title for link that is an ellipsis in English. + _m('more...'), + $ellipsis); + } else { + $short = $content; + } - // @fixme - $out->elementStart('div', array('class' => 'entry-content')); + return $short; } /** @@ -361,10 +410,9 @@ class QnAPlugin extends MicroAppPlugin * @param HTMLOutputter $out * @return Widget */ - function entryForm($out) { - return new QnaquestionForm($out); + return new QnanewquestionForm($out); } /** @@ -372,29 +420,29 @@ class QnAPlugin extends MicroAppPlugin * * @param Notice $notice */ - - function deleteRelated($notice) + function deleteRelated(Notice $notice) { switch ($notice->object_type) { case QnA_Question::OBJECT_TYPE: - common_log(LOG_DEBUG, "Deleting question from notice..."); + common_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..."); + common_debug("Deleting answer from notice..."); $answer = QnA_Answer::fromNotice($notice); - common_log(LOG_DEBUG, "to delete: $answer->id"); + common_debug("to delete: $answer->id"); $answer->delete(); break; default: - common_log(LOG_DEBUG, "Not deleting related, wtf..."); + common_debug("Not deleting related, wtf..."); } } function onEndShowScripts($action) { - // XXX maybe some cool shiz here + $action->script($this->path('js/qna.js')); + return true; } function onEndShowStyles($action)