diff options
author | Antonio Gallo <tonicucoz@gmail.com> | 2010-12-06 21:19:57 +0000 |
---|---|---|
committer | Antonio Gallo <tonicucoz@gmail.com> | 2010-12-06 21:19:57 +0000 |
commit | 87e2c9d5b67e2cd816da2ad27a9a6b9db8b43a4b (patch) | |
tree | 68fb3b84e425c985dc5b21e153457b3dd6540f0c /h-source | |
parent | b037354596f218a8bb42920437f8ea358fbabc8a (diff) |
added NorepeatModel and other minor issues
Diffstat (limited to 'h-source')
-rw-r--r-- | h-source/Application/Controllers/BaseController.php | 5 | ||||
-rw-r--r-- | h-source/Application/Controllers/IssuesController.php | 10 | ||||
-rw-r--r-- | h-source/Application/Models/IssuesModel.php | 31 | ||||
-rw-r--r-- | h-source/Application/Models/MessagesModel.php | 3 | ||||
-rw-r--r-- | h-source/Application/Models/NorepeatModel.php | 35 | ||||
-rw-r--r-- | h-source/Application/Models/TalkModel.php | 4 | ||||
-rw-r--r-- | h-source/Application/Views/Moderators/index.php | 2 | ||||
-rw-r--r-- | h-source/Application/Views/moderator_dialog.php | 2 | ||||
-rwxr-xr-x | h-source/Public/Css/website.css | 1 |
9 files changed, 50 insertions, 43 deletions
diff --git a/h-source/Application/Controllers/BaseController.php b/h-source/Application/Controllers/BaseController.php index 76fc4d3..db85405 100644 --- a/h-source/Application/Controllers/BaseController.php +++ b/h-source/Application/Controllers/BaseController.php @@ -24,8 +24,9 @@ class BaseController extends Controller { protected $lang; - protected $ismoderator; + protected $ismoderator = false; protected $querySanitized = true; + protected $token = 'token'; protected $_topMenuClasses = array( "home" => null, @@ -56,13 +57,13 @@ class BaseController extends Controller $data['islogged'] = 'no'; $data['token'] = 'token'; $data['ismoderator'] = false; - $this->ismoderator = false; if ($this->s['registered']->status['status'] === 'logged') { $data['username'] = $this->s['registered']->status['user']; $data['islogged'] = 'yes'; $data['token'] = $this->s['registered']->status['token']; + $this->token = $data['token']; $data['ismoderator'] = in_array('moderator',$this->s['registered']->status['groups']) ? true : false; $this->ismoderator = $data['ismoderator']; } diff --git a/h-source/Application/Controllers/IssuesController.php b/h-source/Application/Controllers/IssuesController.php index efda83e..53b3c58 100644 --- a/h-source/Application/Controllers/IssuesController.php +++ b/h-source/Application/Controllers/IssuesController.php @@ -36,7 +36,7 @@ class IssuesController extends BaseController $argKeys = array( 'page:forceNat' => 1, - 'token:sanitizeAlphanum' => 'token' + 'token:sanitizeAlphanum' => $this->token, ); $this->setArgKeys($argKeys); @@ -57,7 +57,7 @@ class IssuesController extends BaseController { if ($this->s['registered']->status['status'] === 'logged') { - if (!$this->s['registered']->checkCsrf($this->viewArgs['token'])) $this->redirect('home/index'.$this->lang,2,'wrong token..'); + if (!$this->s['registered']->checkCsrf($this->viewArgs['token'])) $this->redirect('home/index/'.$this->lang,2,'wrong token..'); if ($this->m['UsersModel']->isBlocked($this->s['registered']->status['id_user'])) $this->redirect('my/home/'.$this->lang,2,'your account has been blocked..'); @@ -77,7 +77,7 @@ class IssuesController extends BaseController { if ($this->s['registered']->status['status'] === 'logged') { - if (!$this->s['registered']->checkCsrf($this->viewArgs['token'])) $this->redirect('home/index'.$this->lang,2,'wrong token..'); + if (!$this->s['registered']->checkCsrf($this->viewArgs['token'])) $this->redirect('home/index/'.$this->lang,2,'wrong token..'); $data['preview_message'] = $this->request->post('message','','sanitizeHtml'); $this->m['IssuesModel']->result = false; @@ -126,7 +126,7 @@ class IssuesController extends BaseController { if ($this->s['registered']->status['status'] === 'logged') { - if (!$this->s['registered']->checkCsrf($this->viewArgs['token'])) $this->redirect('home/index'.$this->lang,2,'wrong token..'); + if (!$this->s['registered']->checkCsrf($this->viewArgs['token'])) $this->redirect('home/index/'.$this->lang,2,'wrong token..'); if ($this->m['UsersModel']->isBlocked($this->s['registered']->status['id_user'])) $this->redirect('my/home/'.$this->lang,2,'your account has been blocked..'); @@ -141,7 +141,7 @@ class IssuesController extends BaseController { if ($this->s['registered']->status['status'] === 'logged') { - if (!$this->s['registered']->checkCsrf($this->viewArgs['token'])) $this->redirect('home/index'.$this->lang,2,'wrong token..'); + if (!$this->s['registered']->checkCsrf($this->viewArgs['token'])) $this->redirect('home/index/'.$this->lang,2,'wrong token..'); $data['preview_message'] = $this->request->post('message','','sanitizeHtml'); $this->m['MessagesModel']->result = false; diff --git a/h-source/Application/Models/IssuesModel.php b/h-source/Application/Models/IssuesModel.php index 029d0a1..4593bea 100644 --- a/h-source/Application/Models/IssuesModel.php +++ b/h-source/Application/Models/IssuesModel.php @@ -99,35 +99,4 @@ class IssuesModel extends Model_Tree { parent::__construct(); } -// public $formStruct = array( -// 'entries' => array( -// 'title' => array(), -// 'topic' => array( -// 'type'=>'Select', -// 'options'=>array( -// 'Add a vendor name' => 'add-a-vendor-name', -// 'Maybe a bug' => 'maybe-a-bug', -// 'Add new categories of hardware' => 'new-categories-of-hardware', -// 'Other' => 'other' -// ), -// ), -// 'deleted'=> array( -// 'type' => 'Select', -// 'options' => 'no,yes', -// ), -// 'priority' => array('type'=>'Select','options'=>'low,medium,high'), -// 'message' => array('type'=>'Textarea','idName'=>'bb_code'), -// 'status' => array( -// 'type' => 'Select', -// 'options' => 'opened,closed' -// ), -// 'notice' => array( -// 'type' => 'Textarea', -// 'idName' => 'bb_code_notice', -// ), -// 'id_issue' => array( -// 'type' => 'Hidden' -// ) -// ), -// ); }
\ No newline at end of file diff --git a/h-source/Application/Models/MessagesModel.php b/h-source/Application/Models/MessagesModel.php index fadf6aa..c77894d 100644 --- a/h-source/Application/Models/MessagesModel.php +++ b/h-source/Application/Models/MessagesModel.php @@ -20,7 +20,7 @@ if (!defined('EG')) die('Direct access not allowed!'); -class MessagesModel extends Model_Tree { +class MessagesModel extends NorepeatModel { public function __construct() { $this->_tables = 'messages'; @@ -55,4 +55,5 @@ class MessagesModel extends Model_Tree { ) ), ); + }
\ No newline at end of file diff --git a/h-source/Application/Models/NorepeatModel.php b/h-source/Application/Models/NorepeatModel.php new file mode 100644 index 0000000..39938b6 --- /dev/null +++ b/h-source/Application/Models/NorepeatModel.php @@ -0,0 +1,35 @@ +<?php + +// h-source, a web software to build a community of people that want to share their hardware information. +// Copyright (C) 2010 Antonio Gallo (h-source-copyright.txt) +// +// This file is part of h-source +// +// h-source is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// h-source is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with h-source. If not, see <http://www.gnu.org/licenses/>. + +if (!defined('EG')) die('Direct access not allowed!'); + +class NorepeatModel extends Model_Tree { + + public function insert() + { + parent::insert(); + if ($this->queryResult) + { + header('Refresh: 0;url=http://'.DOMAIN_NAME.$_SERVER['REQUEST_URI']); + exit; + } + } + +}
\ No newline at end of file diff --git a/h-source/Application/Models/TalkModel.php b/h-source/Application/Models/TalkModel.php index 6c77954..d6d935b 100644 --- a/h-source/Application/Models/TalkModel.php +++ b/h-source/Application/Models/TalkModel.php @@ -20,7 +20,7 @@ if (!defined('EG')) die('Direct access not allowed!'); -class TalkModel extends Model_Tree { +class TalkModel extends NorepeatModel { public function __construct() { $this->_tables = 'talk'; @@ -50,5 +50,5 @@ class TalkModel extends Model_Tree { ) ), ); - + }
\ No newline at end of file diff --git a/h-source/Application/Views/Moderators/index.php b/h-source/Application/Views/Moderators/index.php index 7bbe3f3..dabbf56 100644 --- a/h-source/Application/Views/Moderators/index.php +++ b/h-source/Application/Views/Moderators/index.php @@ -23,7 +23,7 @@ <div id="left"> <div class="position_tree_box"> - <a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » <a href="<?php echo $this->baseUrl."/my/home/$lang/$token";?>">panel</a> » moderators' page + <a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » <a href="<?php echo $this->baseUrl."/my/home/$lang/$token";?>">panel</a> » moderators' actions </div> <div class="contrib_explain_box"> diff --git a/h-source/Application/Views/moderator_dialog.php b/h-source/Application/Views/moderator_dialog.php index a25b0c5..94b581c 100644 --- a/h-source/Application/Views/moderator_dialog.php +++ b/h-source/Application/Views/moderator_dialog.php @@ -20,7 +20,7 @@ // along with h-source. If not, see <http://www.gnu.org/licenses/>. ?> -<div id="delete_dialog" title="Manage this message"> +<div id="delete_dialog" title="Manage this item"> <form> <p>Write below your motivation</p> <textarea name="md_message" id="md_message"></textarea> diff --git a/h-source/Public/Css/website.css b/h-source/Public/Css/website.css index baf0932..1d94fdb 100755 --- a/h-source/Public/Css/website.css +++ b/h-source/Public/Css/website.css @@ -1510,6 +1510,7 @@ td.text_item_date } .moderator_panel_link { + margin:5px; padding:10px; border:1px solid #ED9F4A; background:#F6EA99; |