diff options
| -rw-r--r-- | h-source/Application/Controllers/MeetController.php | 214 | ||||
| -rw-r--r-- | h-source/Application/Controllers/UsersController.php | 63 | ||||
| -rw-r--r-- | h-source/Application/Include/myFunctions.php | 23 | ||||
| -rwxr-xr-x | h-source/Application/Models/UsersModel.php | 16 | ||||
| -rw-r--r-- | h-source/Application/Views/Issues/view.php | 3 | ||||
| -rw-r--r-- | h-source/Application/Views/Meet/contributions.php | 56 | ||||
| -rw-r--r-- | h-source/Application/Views/Meet/hardware.php (renamed from h-source/Application/Views/Users/contributions.php) | 4 | ||||
| -rw-r--r-- | h-source/Application/Views/Meet/issues.php | 55 | ||||
| -rw-r--r-- | h-source/Application/Views/Meet/meet.php (renamed from h-source/Application/Views/Users/meet.php) | 2 | ||||
| -rw-r--r-- | h-source/Application/Views/Meet/messages.php | 54 | ||||
| -rw-r--r-- | h-source/Application/Views/My/panel.php | 2 | ||||
| -rw-r--r-- | h-source/Config/Route.php | 7 | ||||
| -rwxr-xr-x | h-source/Public/Css/website.css | 9 |
13 files changed, 416 insertions, 92 deletions
diff --git a/h-source/Application/Controllers/MeetController.php b/h-source/Application/Controllers/MeetController.php new file mode 100644 index 0000000..d2ccc27 --- /dev/null +++ b/h-source/Application/Controllers/MeetController.php @@ -0,0 +1,214 @@ +<?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 program 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. +// +// This program 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 this program. If not, see <http://www.gnu.org/licenses/>. + +if (!defined('EG')) die('Direct access not allowed!'); + +class MeetController extends BaseController +{ + private $whereArray = array( + 'has_confirmed' => 0, + 'deleted' => 'no', + ); + + public function __construct($model, $controller, $queryString) + { + parent::__construct($model, $controller, $queryString); + + $this->model('ProfileModel'); + $this->model('UsersModel'); + $this->model('HardwareModel'); + $this->model('IssuesModel'); + $this->model('MessagesModel'); + + $argKeys = array( + 'page:forceNat' => 1, + ); + + $this->setArgKeys($argKeys); + + $data['title'] = 'meet - '.Website::$generalName; + $this->append($data); + } + + //check if the users exists + private function userExists($user) + { + $clean['user'] = ctype_alnum($user) ? sanitizeAll($user) : ''; + + if (strcmp($clean['user'],'') !== 0) + { + $res = $this->m['UsersModel']->db->select('regusers','has_confirmed,deleted,username','username="'.$clean['user'].'" and has_confirmed=0 and deleted="no"'); + + if (count($res) > 0) + { + return true; + } + } + return false; + } + + //public page of the user + public function user($lang = 'en', $user = '') + { + $clean['user'] = ctype_alnum($user) ? sanitizeAll($user) : ''; + $data['title'] = "meet ".$clean['user']." - ".Website::$generalName; + + $this->shift(2); + + if ($this->userExists($clean['user'])) + { + $this->whereArray['username'] = $clean['user']; + + $data['table'] = $this->m['ProfileModel']->select('regusers.e_mail,regusers.username,profile.*')->from('regusers inner join profile')->on('regusers.id_user = profile.created_by')->where($this->whereArray)->send(); + + $data['meet_username'] = $clean['user']; + + $this->append($data); + $this->load('meet'); + $this->right(); + } + + } + + //contributions menu + public function contributions($lang = 'en', $user = '') + { + $clean['user'] = ctype_alnum($user) ? sanitizeAll($user) : ''; + $data['title'] = $clean['user']." contributions - ".Website::$generalName; + + $this->shift(2); + + if ($this->userExists($clean['user'])) + { + $clean['id_user'] = (int)$this->m['UsersModel']->getUserId($clean['user']); + + $this->whereArray['username'] = $clean['user']; + + $data['meet_username'] = $clean['user']; + + $hardNumb = $this->m['HardwareModel']->select()->where($this->whereArray)->rowNumber(); + + $issuesNumb = $this->m['IssuesModel']->select('id_issue')->where(array('created_by'=>$clean['id_user'],'deleted'=>'no'))->rowNumber(); + + $messNumb = $this->m['MessagesModel']->select('id_mes,messages.id_issue,messages.creation_date')->where(array('created_by'=>$clean['id_user'],'deleted'=>'no'))->rowNumber(); + + $data['hasHardware'] = $hardNumb > 0 ? true : false; + $data['hasIssues'] = $issuesNumb > 0 ? true : false; + $data['hasMessages'] = $messNumb > 0 ? true : false; + + $this->append($data); + $this->load('contributions'); + $this->right(); + } + + } + + //hardware contributions + public function hardware($lang = 'en', $user = '') + { + $clean['user'] = ctype_alnum($user) ? sanitizeAll($user) : ''; + $data['title'] = "hardware contributions - ".Website::$generalName; + + $this->shift(2); + + if ($this->userExists($clean['user'])) + { + $this->whereArray['username'] = $clean['user']; + + $data['table'] = $this->m['HardwareModel']->select('hardware.*,regusers.username')->where($this->whereArray)->send(); + + $data['meet_username'] = $clean['user']; + + $this->append($data); + $this->load('hardware'); + $this->right(); + } + + } + + //issues opened + public function issues($lang = 'en', $user = '') + { + $clean['user'] = ctype_alnum($user) ? sanitizeAll($user) : ''; + $data['title'] = "issues submitted - ".Website::$generalName; + + $this->shift(2); + + if ($this->userExists($clean['user'])) + { + //load the Pages helper + $this->helper('Pages','meet/issues/'.$this->lang.'/'.$clean['user'],'page'); + + $clean['id_user'] = (int)$this->m['UsersModel']->getUserId($clean['user']); + + $this->m['IssuesModel']->select('id_issue')->where(array('created_by'=>$clean['id_user'],'deleted'=>'no'))->orderBy('id_issue desc'); + + $recordNumber = $this->m['IssuesModel']->rowNumber(); + $page = $this->viewArgs['page']; + + $this->m['IssuesModel']->limit = $this->h['Pages']->getLimit($page,$recordNumber,20); + + $data['table'] = $this->m['IssuesModel']->select('id_issue,creation_date,title')->send(); + + $data['pageList'] = $this->h['Pages']->render($page-3,7); + + $data['meet_username'] = $clean['user']; + + $this->append($data); + $this->load('issues'); + $this->right(); + } + + } + + //messages submitted + public function messages($lang = 'en', $user = '') + { + $clean['user'] = ctype_alnum($user) ? sanitizeAll($user) : ''; + $data['title'] = "messages submitted - ".Website::$generalName; + + $this->shift(2); + + if ($this->userExists($clean['user'])) + { + //load the Pages helper + $this->helper('Pages','meet/messages/'.$this->lang.'/'.$clean['user'],'page'); + + $clean['id_user'] = (int)$this->m['UsersModel']->getUserId($clean['user']); + + $this->m['MessagesModel']->from('messages inner join issues')->on('messages.id_issue=issues.id_issue')->select('id_mes,messages.id_issue,messages.creation_date,title')->where(array('created_by'=>$clean['id_user'],'deleted'=>'no'))->orderBy('id_mes desc'); + + $recordNumber = $this->m['MessagesModel']->rowNumber(); + $page = $this->viewArgs['page']; + + $this->m['MessagesModel']->limit = $this->h['Pages']->getLimit($page,$recordNumber,20); + + $data['table'] = $this->m['MessagesModel']->send(); + + $data['meet_username'] = $clean['user']; + + $data['pageList'] = $this->h['Pages']->render($page-3,7); + + $this->append($data); + $this->load('messages'); + $this->right(); + } + + } + +}
\ No newline at end of file diff --git a/h-source/Application/Controllers/UsersController.php b/h-source/Application/Controllers/UsersController.php index db30483..cfa5170 100644 --- a/h-source/Application/Controllers/UsersController.php +++ b/h-source/Application/Controllers/UsersController.php @@ -361,68 +361,5 @@ class UsersController extends BaseController $this->redirect('users/login/'.$this->lang,0); } } - - public function meet($lang = 'en', $user = '') - { - $clean['user'] = ctype_alnum($user) ? sanitizeAll($user) : ''; - $data['title'] = "meet ".$clean['user']." - ".Website::$generalName; - - if (strcmp($clean['user'],'') !== 0) - { - $this->shift(2); - - $res = $this->m['UsersModel']->db->select('regusers','has_confirmed,deleted,username','username="'.$clean['user'].'" and has_confirmed=0 and deleted="no"'); -// echo $this->m['UsersModel']->getQuery(); - if (count($res) > 0) - { - $whereArray = array( - 'username' => $clean['user'], - 'has_confirmed' => 0, - 'deleted' => 'no' - ); - - $data['table'] = $this->m['ProfileModel']->select('regusers.e_mail,regusers.username,profile.*')->from('regusers inner join profile')->on('regusers.id_user = profile.created_by')->where($whereArray)->send(); - - // echo $this->m['HardwareModel']->getQuery(); - - $data['meet_username'] = $res[0]['regusers']['username']; - - $this->append($data); - $this->load('meet'); - $this->right(); - } - } - } - - public function contributions($lang = 'en', $user = '') - { - $clean['user'] = ctype_alnum($user) ? sanitizeAll($user) : ''; - $data['title'] = $clean['user']." contributions - ".Website::$generalName; - - if (strcmp($clean['user'],'') !== 0) - { - $this->shift(2); - - $res = $this->m['UsersModel']->db->select('regusers','has_confirmed,deleted,username','username="'.$clean['user'].'" and has_confirmed=0 and deleted="no"'); - - if (count($res) > 0) - { - $whereArray = array( - 'username' => $clean['user'], - 'has_confirmed' => 0, - 'deleted' => 'no' - ); - - $data['table'] = $this->m['HardwareModel']->select('hardware.*,regusers.username')->where($whereArray)->send(); - // echo $this->m['HardwareModel']->getQuery(); - - $data['meet_username'] = $res[0]['regusers']['username']; - - $this->append($data); - $this->load('contributions'); - $this->right(); - } - } - } }
\ No newline at end of file diff --git a/h-source/Application/Include/myFunctions.php b/h-source/Application/Include/myFunctions.php index b72be6c..b95cc61 100644 --- a/h-source/Application/Include/myFunctions.php +++ b/h-source/Application/Include/myFunctions.php @@ -85,27 +85,6 @@ function getOrderByClause($string) } -// function isEqual($str1, $str2) -// { -// // $str1 = str_replace("\n",'',$str1); -// // $str1 = str_replace("\r",null,$str1); -// // $str2 = str_replace("\n",'',$str1); -// // $str2 = str_replace("\r",null,$str1); -// -// return (strcmp($str1,$str2) === 0) ? true : false; -// } -// -// function getNewKeys($array,$ovalue) -// { -// $res = array(); -// for ($i = 0; $i < count($array); $i++) -// { -// if (isEqual($array[$i],$ovalue)) $res[] = $i; -// // if (strcmp($keys[$i],$ovalue) === 0) $res[] = $i; -// } -// return $res; -// } - function diff($old, $new){ $maxlen = 0; foreach($old as $oindex => $ovalue){ @@ -168,7 +147,7 @@ function getLinkToUser($user) } else { - return "<a href='http://".DOMAIN_NAME."/users/meet/".Lang::$current."/$user'>$user</a>"; + return "<a href='http://".DOMAIN_NAME."/meet/user/".Lang::$current."/$user'>$user</a>"; } } diff --git a/h-source/Application/Models/UsersModel.php b/h-source/Application/Models/UsersModel.php index c425079..7a221cd 100755 --- a/h-source/Application/Models/UsersModel.php +++ b/h-source/Application/Models/UsersModel.php @@ -86,6 +86,22 @@ class UsersModel extends Model_Map } } + //get the user id from the username + public function getUserId($username) + { + $clean['username'] = ctype_alnum($username) ? sanitizeAll($username) : ''; + + $users = $this->select('id_user')->where(array('username'=>$clean['username'],'has_confirmed'=>0,'deleted'=>'no'))->send(); + if (count($users) > 0) + { + return $users[0]['regusers']['id_user']; + } + else + { + return 0; + } + } + public function insert() { //create the token diff --git a/h-source/Application/Views/Issues/view.php b/h-source/Application/Views/Issues/view.php index ef5e39c..d15b3ce 100644 --- a/h-source/Application/Views/Issues/view.php +++ b/h-source/Application/Views/Issues/view.php @@ -98,7 +98,8 @@ <?php if (strcmp($row['messages']['deleted'],'no') === 0) { ?> - <div class="issues_message_item"> + + <a name="message-<?php echo $row['messages']['id_mes'];?>"></a><div class="issues_message_item"> <div class="issues_message_item_user"> <div class="issues_message_item_user_inner"> <?php echo $u->getUser($row['messages']['created_by']);?>: diff --git a/h-source/Application/Views/Meet/contributions.php b/h-source/Application/Views/Meet/contributions.php new file mode 100644 index 0000000..f679c71 --- /dev/null +++ b/h-source/Application/Views/Meet/contributions.php @@ -0,0 +1,56 @@ +<?php if (!defined('EG')) die('Direct access not allowed!'); ?> + +<?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 program 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. +// +// This program 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 this program. If not, see <http://www.gnu.org/licenses/>. +?> + + <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."/meet/user/$lang/$meet_username";?>">meet <b><?php echo $meet_username;?></b></a> » contributions + </div> + + <div class="contrib_explain_box"> + contributions of <?php echo $meet_username;?> + </div> + + <div class="external_users_contrib"> + + <!--hardware contributions--> + <?php if ($hasHardware) { ?> + <div class="user_hardware_pages"> + <a href="<?php echo $this->baseUrl."/meet/hardware/$lang/$meet_username";?>">hardware inserted/updated by <b><?php echo $meet_username;?></b></a> + </div> + <?php } ?> + + <!--issues opened--> + <?php if ($hasIssues) { ?> + <div class="user_hardware_pages"> + <a href="<?php echo $this->baseUrl."/meet/issues/$lang/$meet_username".$this->viewStatus;?>">issues opened by <b><?php echo $meet_username;?></b></a> + </div> + <?php } ?> + + <!--messages submitted--> + <?php if ($hasMessages) { ?> + <div class="user_hardware_pages"> + <a href="<?php echo $this->baseUrl."/meet/messages/$lang/$meet_username".$this->viewStatus;?>">messages submitted by <b><?php echo $meet_username;?></b></a> + </div> + <?php } ?> + + </div> + + </div>
\ No newline at end of file diff --git a/h-source/Application/Views/Users/contributions.php b/h-source/Application/Views/Meet/hardware.php index 2d5995a..6cb2212 100644 --- a/h-source/Application/Views/Users/contributions.php +++ b/h-source/Application/Views/Meet/hardware.php @@ -21,11 +21,11 @@ <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."/users/meet/$lang/$meet_username";?>">meet <b><?php echo $meet_username;?></b></a> » contributions + <a href="<?php echo $this->baseUrl."/home/index/$lang";?>">Home</a> » <a href="<?php echo $this->baseUrl."/meet/user/$lang/$meet_username";?>">meet <b><?php echo $meet_username;?></b></a> » <a href="<?php echo $this->baseUrl."/meet/contributions/$lang/$meet_username";?>">contributions</a> » hardware contributions </div> <div class="contrib_explain_box"> - contributions of <?php echo $meet_username;?> + hardware contributions of <?php echo $meet_username;?> </div> <div class="external_users_contrib"> diff --git a/h-source/Application/Views/Meet/issues.php b/h-source/Application/Views/Meet/issues.php new file mode 100644 index 0000000..c1315e1 --- /dev/null +++ b/h-source/Application/Views/Meet/issues.php @@ -0,0 +1,55 @@ +<?php if (!defined('EG')) die('Direct access not allowed!'); ?> + +<?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 program 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. +// +// This program 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 this program. If not, see <http://www.gnu.org/licenses/>. +?> + + <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."/meet/user/$lang/$meet_username";?>">meet <b><?php echo $meet_username;?></b></a> » <a href="<?php echo $this->baseUrl."/meet/contributions/$lang/$meet_username";?>">contributions</a> » issues opened + </div> + + <div class="contrib_explain_box"> + issues opened by <?php echo $meet_username;?> + </div> + + <div class="external_users_contrib"> + <?php foreach ($table as $item) {?> + <div class="users_contrib_item"> + + <div class="contribution_item"> + <?php + + $i_date = $item['issues']['creation_date']; + $i_title = $item['issues']['title']; + $i_id = $item['issues']['id_issue']; + + ?> + + <?php echo "<a href='".$this->baseUrl."/issues/view/$lang/$i_id'>".$i_title."</a> at ".smartDate($i_date);?> + </div> + + </div> + <?php } ?> + </div> + + <div class="history_page_list"> + <?php echo gtext("page list");?>: <?php echo $pageList;?> + </div> + + </div>
\ No newline at end of file diff --git a/h-source/Application/Views/Users/meet.php b/h-source/Application/Views/Meet/meet.php index ee0c708..35e106c 100644 --- a/h-source/Application/Views/Users/meet.php +++ b/h-source/Application/Views/Meet/meet.php @@ -25,7 +25,7 @@ </div> <div class="meet_contrib_link"> - <u>Public profile of <?php echo $meet_username;?></u>. See all <a href="<?php echo $this->baseUrl."/users/contributions/$lang/$meet_username";?>"><b><?php echo $meet_username;?></b> contributions</a> + <u>Public profile of <?php echo $meet_username;?></u>. See all <a href="<?php echo $this->baseUrl."/meet/contributions/$lang/$meet_username";?>"><b><?php echo $meet_username;?></b> contributions</a> </div> <?php foreach ($table as $item) {?> diff --git a/h-source/Application/Views/Meet/messages.php b/h-source/Application/Views/Meet/messages.php new file mode 100644 index 0000000..6b4085f --- /dev/null +++ b/h-source/Application/Views/Meet/messages.php @@ -0,0 +1,54 @@ +<?php if (!defined('EG')) die('Direct access not allowed!'); ?> + +<?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 program 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. +// +// This program 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 this program. If not, see <http://www.gnu.org/licenses/>. +?> + + <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."/meet/user/$lang/$meet_username";?>">meet <b><?php echo $meet_username;?></b></a> » <a href="<?php echo $this->baseUrl."/meet/contributions/$lang/$meet_username";?>">contributions</a> » messages submitted + </div> + + <div class="contrib_explain_box"> + messages submitted by <?php echo $meet_username;?> + </div> + + <div class="external_users_contrib"> + <?php foreach ($table as $item) {?> + <div class="users_contrib_item"> + + <div class="contribution_item"> + <?php + + $m_date = $item['messages']['creation_date']; + $m_id = $item['messages']['id_mes']; + $i_id = $item['messages']['id_issue']; + + ?> + + <?php echo "<a href='".$this->baseUrl."/issues/view/$lang/$i_id#message-$m_id'>".smartDate($m_date)."</a>";?> submitted to the issue <b><?php echo $item['issues']['title'];?></b> + </div> + + </div> + <?php } ?> + </div> + + <div class="history_page_list"> + <?php echo gtext("page list");?>: <?php echo $pageList;?> + </div> + </div>
\ No newline at end of file diff --git a/h-source/Application/Views/My/panel.php b/h-source/Application/Views/My/panel.php index d03d274..1052462 100644 --- a/h-source/Application/Views/My/panel.php +++ b/h-source/Application/Views/My/panel.php @@ -25,7 +25,7 @@ </div> <ul class='panelApplicationList'> - <li><a href="<?php echo Url::getRoot('users/meet/'.$lang.'/'.$username);?>">Watch your public profile</a></li> + <li><a href="<?php echo Url::getRoot('meet/user/'.$lang.'/'.$username);?>">Watch your public profile</a></li> <li><a href="<?php echo Url::getRoot('my/profile/'.$lang.'/'.$token);?>">Edit your profile</a></li> <li><a href="<?php echo Url::getRoot('my/email/'.$lang.'/'.$token);?>">Change the e-mail address</a></li> <li><a href="<?php echo Url::getRoot('my/password/'.$lang.'/'.$token);?>">Change the password</a></li> diff --git a/h-source/Config/Route.php b/h-source/Config/Route.php index fd31718..b26caab 100644 --- a/h-source/Config/Route.php +++ b/h-source/Config/Route.php @@ -41,8 +41,11 @@ class Route 'users,change', 'users,forgot', 'users,notice', - 'users,meet', - 'users,contributions', + 'meet,user', + 'meet,contributions', + 'meet,hardware', + 'meet,issues', + 'meet,messages', 'wifi,catalogue', 'wifi,view', 'wifi,history', diff --git a/h-source/Public/Css/website.css b/h-source/Public/Css/website.css index 04e3c97..9809448 100755 --- a/h-source/Public/Css/website.css +++ b/h-source/Public/Css/website.css @@ -1436,4 +1436,13 @@ ins border:1px solid #6495ED; padding:5px; font:normal 14px/1.5 sans-serif,arial,Verdana; +} + +.user_hardware_pages +{ + margin:10px 5px; + padding:10px; + background:#F1D8D8; +/* border-bottom:1px solid #D26262; */ +/* border-top:1px solid #D26262; */ }
\ No newline at end of file |