Permalink
Browse files

Merge branch 'master' of github.com:vanillaforums/Garden

  • Loading branch information...
2 parents fcd6034 + d36dac7 commit 9bd6869cda3a790a882a1d6d79fe2e8f2d94682d @linc linc committed Feb 28, 2012
Showing with 3,302 additions and 1,149 deletions.
  1. +1 −2 applications/conversations/settings/class.hooks.php
  2. +5 −3 applications/conversations/views/messages/add.php
  3. +2 −2 applications/dashboard/controllers/class.entrycontroller.php
  4. +33 −0 applications/dashboard/controllers/class.logcontroller.php
  5. +11 −0 applications/dashboard/controllers/class.utilitycontroller.php
  6. +90 −145 applications/dashboard/design/style.css
  7. +9 −3 applications/dashboard/models/class.banmodel.php
  8. +6 −2 applications/dashboard/models/class.logmodel.php
  9. +83 −29 applications/dashboard/models/class.usermodel.php
  10. +31 −2 applications/dashboard/modules/class.headmodule.php
  11. +4 −1 applications/dashboard/views/activity/all.php
  12. +3 −1 applications/dashboard/views/activity/index.php
  13. +7 −4 applications/dashboard/views/embed/index.php
  14. +5 −2 applications/dashboard/views/entry/connect.php
  15. +1 −1 applications/dashboard/views/entry/emailconfirm.php
  16. +1 −1 applications/dashboard/views/entry/emailconfirmrequest.php
  17. +1 −1 applications/dashboard/views/entry/leave.php
  18. +1 −1 applications/dashboard/views/entry/passwordform.php
  19. +1 −1 applications/dashboard/views/entry/passwordrequest.php
  20. +1 −1 applications/dashboard/views/entry/passwordrequestsent.php
  21. +1 −1 applications/dashboard/views/entry/redirect.php
  22. +8 −6 applications/dashboard/views/entry/registerapproval.php
  23. +8 −6 applications/dashboard/views/entry/registerbasic.php
  24. +8 −6 applications/dashboard/views/entry/registercaptcha.php
  25. +4 −2 applications/dashboard/views/entry/registerclosed.php
  26. +7 −5 applications/dashboard/views/entry/registerinvitation.php
  27. +1 −1 applications/dashboard/views/entry/registerthanks.php
  28. +30 −0 applications/dashboard/views/log/record.php
  29. +1 −1 applications/dashboard/views/modules/me.php
  30. +21 −25 applications/dashboard/views/modules/sidemenu.php
  31. +5 −5 applications/dashboard/views/modules/userinfo.php
  32. +11 −0 applications/dashboard/views/popup.master.tpl
  33. +1 −1 applications/dashboard/views/rss.master
  34. +1 −1 applications/dashboard/views/user/ban.php
  35. +132 −191 applications/vanilla/controllers/class.discussioncontroller.php
  36. +109 −4 applications/vanilla/controllers/class.postcontroller.php
  37. +1 −0 applications/vanilla/controllers/class.settingscontroller.php
  38. +13 −3 applications/vanilla/js/discussion.js
  39. +4 −1 applications/vanilla/js/discussions.js
  40. +0 −21 applications/vanilla/js/options.js
  41. +3 −0 applications/vanilla/locale/en-CA/definitions.php
  42. +22 −2 applications/vanilla/models/class.commentmodel.php
  43. +20 −2 applications/vanilla/models/class.discussionmodel.php
  44. +13 −2 applications/vanilla/settings/structure.php
  45. +1 −1 applications/vanilla/views/categories/table.php
  46. +17 −0 applications/vanilla/views/discussion/announce.php
  47. +4 −1 applications/vanilla/views/discussion/discussion.php
  48. +28 −18 applications/vanilla/views/discussion/embed.php
  49. +49 −18 applications/vanilla/views/discussion/helper_functions.php
  50. +3 −1 applications/vanilla/views/discussion/index.php
  51. +0 −1 applications/vanilla/views/discussions/discussions.php
  52. +143 −62 applications/vanilla/views/discussions/helper_functions.php
  53. +5 −3 applications/vanilla/views/discussions/index.php
  54. +4 −4 applications/vanilla/views/discussions/index_rss.php
  55. +14 −1 applications/vanilla/views/discussions/table.php
  56. +1 −1 applications/vanilla/views/modules/discussionfilter.php
  57. +13 −4 applications/vanilla/views/post/comment.php
  58. +3 −1 applications/vanilla/views/post/discussion.php
  59. +1 −1 conf/config-defaults.php
  60. +1 −1 index.php
  61. +42 −17 js/count.js
  62. +0 −6 js/embed.js
  63. +4 −1 js/embed_local.js
  64. +28 −10 js/global.js
  65. +207 −207 js/slice.js
  66. +1 −1 library/core/authenticators/class.passwordauthenticator.php
  67. +2 −1 library/core/class.autoloader.php
  68. +25 −0 library/core/class.controller.php
  69. +1 −1 library/core/class.cookieidentity.php
  70. +19 −2 library/core/class.form.php
  71. +18 −0 library/core/class.format.php
  72. +46 −10 library/core/class.proxyrequest.php
  73. +11 −19 library/core/class.session.php
  74. +4 −1 library/core/class.theme.php
  75. +121 −42 library/core/functions.general.php
  76. +1,393 −0 library/vendors/simplehtmldom/simple_html_dom.php
  77. +1 −1 plugins/ButtonBar/class.buttonbar.plugin.php
  78. +36 −14 plugins/ButtonBar/js/buttonbar.js
  79. +42 −22 plugins/Emotify/class.emotify.plugin.php
  80. +9 −0 plugins/Emotify/design/emotify.css
  81. +2 −2 plugins/Facebook/class.facebook.plugin.php
  82. +26 −0 plugins/HtmLawed/class.htmlawed.plugin.php
  83. +185 −185 plugins/VanillaStats/js/picker.js
  84. +1 −1 plugins/VanillaStats/js/vanillastats.js
  85. +7 −0 showpost.php
  86. +62 −0 showthread.php
  87. +2 −0 themes/mobile/design/custom.css
@@ -79,8 +79,7 @@ public function ProfileController_AfterAddSideMenu_Handler($Sender) {
*/
public function ProfileController_BeforeProfileOptions_Handler($Sender) {
// Add a "send X a message" link to the side menu on the profile page
- $Session = Gdn::Session();
- if (!$Sender->EditMode && $Session->IsValid() && $Session->UserID != $Sender->User->UserID)
+ if (!$Sender->EditMode && Gdn::Session()->IsValid() && Gdn::Session()->UserID != $Sender->User->UserID)
echo ' '.Anchor(T('Message'), '/messages/add/'.$Sender->User->Name, 'Button').' ';
}
@@ -1,8 +1,9 @@
-<?php if (!defined('APPLICATION')) exit();
-?>
-<div id="ConversationForm">
+<?php if (!defined('APPLICATION')) exit(); ?>
+<div id="ConversationForm" class="FormTitleWrapper">
<?php
echo Wrap($this->Data('Title'), 'h1');
+
+ echo '<div class="FormWrapper">';
echo $this->Form->Open();
echo $this->Form->Errors();
@@ -26,5 +27,6 @@
echo '</div>';
echo $this->Form->Close('Start Conversation');
+ echo '</div>';
?>
</div>
@@ -73,7 +73,7 @@ public function __construct() {
switch (isset($_GET['display'])) {
case 'popup':
- $this->MasterView = 'empty';
+ $this->MasterView = 'popup';
break;
}
}
@@ -598,7 +598,7 @@ protected function _SetRedirect($CheckPopup = FALSE) {
$Url = Url($this->RedirectTo(), TRUE);
$this->RedirectUrl = $Url;
- $this->MasterView = 'empty';
+ $this->MasterView = 'popup';
$this->View = 'redirect';
if ($this->_RealDeliveryType != DELIVERY_TYPE_ALL && $this->DeliveryType() != DELIVERY_TYPE_ALL) {
@@ -178,6 +178,39 @@ public function Edits($Type = '', $Page = '') {
}
/**
+ * Access the log history of a specific record
+ *
+ * @param string $RecordType
+ * @param int $RecordID
+ */
+ public function Record($RecordType, $RecordID, $Page = '') {
+ $this->Permission('Garden.Moderation.Manage');
+ list($Offset, $Limit) = OffsetLimit($Page, 10);
+ $this->SetData('Title', T('Change Log'));
+
+ $RecordType = ucfirst($RecordType);
+ $Where = array(
+ 'Operation' => array('Edit', 'Delete', 'Ban'),
+ 'RecordType' => $RecordType,
+ 'RecordID' => $RecordID
+ );
+
+ $RecordCount = $this->LogModel->GetCountWhere($Where);
+ $this->SetData('RecordCount', $RecordCount);
+ if ($Offset >= $RecordCount)
+ $Offset = $RecordCount - $Limit;
+
+ $Log = $this->LogModel->GetWhere($Where, 'LogID', 'Desc', $Offset, $Limit);
+ $this->SetData('Log', $Log);
+
+ if ($this->DeliveryType() == DELIVERY_TYPE_VIEW)
+ $this->View = 'Table';
+
+ $this->AddSideMenu('dashboard/log/edits');
+ $this->Render();
+ }
+
+ /**
* Convenience method to call model's FormatContent.
*
* @since 2.0.?
@@ -519,4 +519,15 @@ public function GetFeed($Type = 'news', $Length = 5, $FeedFormat = 'normal') {
$this->DeliveryType(DELIVERY_TYPE_NONE);
$this->Render();
}
+
+ /**
+ * Return some meta information about any page on the internet in JSON format.
+ */
+ public function FetchPageInfo($Url = '') {
+ $PageInfo = FetchPageInfo($Url);
+ $this->SetData('PageInfo', $PageInfo);
+ $this->DeliveryType(DELIVERY_TYPE_DATA);
+ $this->DeliveryMethod(DELIVERY_METHOD_JSON);
+ $this->Render();
+ }
}
Oops, something went wrong.

0 comments on commit 9bd6869

Please sign in to comment.