diff options
Diffstat (limited to 'h-source')
| -rw-r--r-- | h-source/Application/Controllers/BaseController.php | 2 | ||||
| -rw-r--r-- | h-source/Application/Controllers/LastController.php | 2 | ||||
| -rw-r--r-- | h-source/Application/Include/mediawiki.php | 29 | ||||
| -rw-r--r-- | h-source/Application/Models/HardwareModel.php | 2 |
4 files changed, 3 insertions, 32 deletions
diff --git a/h-source/Application/Controllers/BaseController.php b/h-source/Application/Controllers/BaseController.php index 7eb4236..7d03735 100644 --- a/h-source/Application/Controllers/BaseController.php +++ b/h-source/Application/Controllers/BaseController.php @@ -119,7 +119,7 @@ class BaseController extends Controller $data['lastModif'] = $this->m['HistoryModel'] ->select() - ->where(array('type'=>'wiki','gr'=>'registered')) + ->where(array('type'=>'hardware','gr'=>'registered')) ->orderBy('id_history desc') ->limit(5) ->send(); diff --git a/h-source/Application/Controllers/LastController.php b/h-source/Application/Controllers/LastController.php index 0791ccb..c357c1a 100644 --- a/h-source/Application/Controllers/LastController.php +++ b/h-source/Application/Controllers/LastController.php @@ -41,7 +41,7 @@ class LastController extends BaseController $whereClauseArray = array( 'gr' => 'registered', - 'type' => 'wiki', + 'type' => 'hardware', ); $this->helper('Pages','last/modifications/'.$this->lang,'page'); diff --git a/h-source/Application/Include/mediawiki.php b/h-source/Application/Include/mediawiki.php deleted file mode 100644 index 910ef9d..0000000 --- a/h-source/Application/Include/mediawiki.php +++ /dev/null @@ -1,29 +0,0 @@ -<?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!'); - - -define('SAME_DB','no'); - -define('MW_DB', 'mediawiki'); -define('MW_USER', 'root'); -define('MW_PWD', ''); -define('MW_HOST', 'localhost');
\ No newline at end of file diff --git a/h-source/Application/Models/HardwareModel.php b/h-source/Application/Models/HardwareModel.php index 150abc8..10f899e 100644 --- a/h-source/Application/Models/HardwareModel.php +++ b/h-source/Application/Models/HardwareModel.php @@ -226,7 +226,7 @@ class HardwareModel extends Model_Map { $history = new HistoryModel(); $history->values = array( 'created_by' => $this->id_user, - 'type' => 'wiki', + 'type' => 'hardware', 'action' => $action, 'id' => $this->lastId, 'message' => 'The device having id='.$this->lastId.' has been '.$translations[$action].' by the user ' . $clean['user'] . ' (id_user='.$this->id_user.') ', |