X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FQnA%2FQnAPlugin.php;h=7c6c3e00e355fd6367c604ba64be127d71b063da;hb=f2bfcdc2c1d7bc4634bb06285380884a57075759;hp=35811a309a742d6849685e789a0df86d7900c7f4;hpb=9d18b57812ae660f40daef892c5a0841881d7d06;p=quix0rs-gnu-social.git
diff --git a/plugins/QnA/QnAPlugin.php b/plugins/QnA/QnAPlugin.php
index 35811a309a..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,57 +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 'QnaclosequestionAction':
- case 'QnashowanswerAction':
- case 'QnareviseanswerAction':
- case 'QnavoteAction':
- include_once $dir . '/actions/'
- . strtolower(mb_substr($cls, 0, -6)) . '.php';
- return false;
- case 'QnanewquestionForm':
- case 'QnashowquestionForm':
- case 'QnanewanswerForm':
- case 'QnashowanswerForm':
- 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}';
@@ -159,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() {
@@ -197,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;
@@ -221,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;
@@ -243,7 +214,7 @@ class QnAPlugin extends MicroAppPlugin
* @return ActivityObject
*/
- function activityObjectFromNotice($notice)
+ function activityObjectFromNotice(Notice $notice)
{
$question = null;
@@ -258,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();
@@ -272,31 +245,13 @@ 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
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;
- }
-
/**
* Output our CSS class for QnA notice list elements
*
@@ -313,9 +268,20 @@ class QnAPlugin extends MicroAppPlugin
{
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' => 'hentry notice question',
+ 'class' => $class,
'id' => 'notice-' . $id
)
);
@@ -325,9 +291,9 @@ class QnAPlugin extends MicroAppPlugin
case QnA_Answer::OBJECT_TYPE:
$id = (empty($nli->repeat)) ? $nli->notice->id : $nli->repeat->id;
- $cls = array('hentry', 'notice', 'answer');
+ $cls = array('h-entry', 'notice', 'answer');
- $answer = QnA_Answer::staticGet('uri', $notice->uri);
+ $answer = QnA_Answer::getKV('uri', $nli->notice->uri);
if (!empty($answer) && !empty($answer->best)) {
$cls[] = 'best';
@@ -351,90 +317,68 @@ class QnAPlugin extends MicroAppPlugin
}
/**
- * 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-description'));
+ $nli->showNoticeOptions();
- $question = QnA_Question::getByNotice($notice);
+ if ($notice->object_type == QnA_Question::OBJECT_TYPE) {
+ $user = common_current_user();
+ $question = QnA_Question::getByNotice($notice);
- if (!empty($question)) {
- if (empty($user)) {
- $form = new QnashowquestionForm($out, $question);
- $form->show();
- } else {
+ if (!empty($user) and !empty($question)) {
$profile = $user->getProfile();
$answer = $question->getAnswer($profile);
- if (empty($answer)) {
- $form = new QnanewanswerForm($out, $question);
- $form->show();
- } else {
- $form = new QnashowquestionForm($out, $question);
- $form->show();
+
+ // 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');
}
}
- } 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();
-
- $answer = QnA_Answer::getByNotice($notice);
- $question = $answer->getQuestion();
-
- $nli = new NoticeListItem($notice, $out);
- $nli->showNotice();
-
- $out->elementStart('div', array('class' => 'entry-content answer-content'));
-
- if (!empty($answer)) {
- $form = new QnashowanswerForm($out, $answer);
- $form->show();
- } else {
- $out->text(_m('Answer data is missing.'));
- }
-
- $out->elementEnd('div');
-
- // @fixme
- $out->elementStart('div', array('class' => 'entry-content'));
+ function adaptNoticeListItem($nli) {
+ return new QnAListItem($nli);
}
static function shorten($content, $notice)
@@ -444,12 +388,15 @@ class QnAPlugin extends MicroAppPlugin
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(
- 'â¦',
- $notice->uri,
- _m('more')
- );
+ $short .= sprintf('%3$s',
+ $notice->getUrl(),
+ // TRANS: Title for link that is an ellipsis in English.
+ _m('more...'),
+ $ellipsis);
} else {
$short = $content;
}
@@ -463,7 +410,6 @@ class QnAPlugin extends MicroAppPlugin
* @param HTMLOutputter $out
* @return Widget
*/
-
function entryForm($out)
{
return new QnanewquestionForm($out);
@@ -474,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)