Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit e138119

Browse files
author
Charles Marion
committed
ENH: Added notification sysmte
Added ldap module Added indentation checking Fixed style
1 parent ac966a1 commit e138119

File tree

105 files changed

+2003
-1274
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+2003
-1274
lines changed

‎core/AppController.php‎

Lines changed: 62 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ public function preDispatch()
2929

3030
$this->view->title = Zend_Registry::get('configGlobal')->application->name;
3131

32+
// init notifier
33+
Zend_Registry::set('notifier', new MIDAS_Notifier());
34+
3235
// Set the version
3336
$this->view->version = '3.0.0';
3437
if(isset(Zend_Registry::get('configDatabase')->version))
@@ -123,7 +126,7 @@ public function preDispatch()
123126
}
124127

125128
$this->view->lang = Zend_Registry::get('configGlobal')->application->lang;
126-
//create a global javascript json array
129+
//create a global javascript json array
127130
$jsonGlobal = array(
128131
"webroot" => $this->view->webroot,
129132
"coreWebroot" => $this->view->coreWebroot,
@@ -158,6 +161,7 @@ public function preDispatch()
158161
'copy' => $this->t('Copy'),
159162
'element' => $this->t('element'),
160163
'community' => array(
164+
161165
'invit' => $this->t('Invite collaborators'),
162166
'advanced' => $this->t('Advanced properties')));
163167

@@ -212,7 +216,7 @@ public function isUpgradeNeeded()
212216
return false;
213217
}
214218

215-
/** zend post dispatch*/
219+
/** zend post dispatch*/
216220
public function postDispatch()
217221
{
218222
parent::postDispatch();
@@ -240,89 +244,89 @@ protected function t($text)
240244

241245
/**completion eclipse*/
242246
/**
243-
* Assetstrore Model
244-
* @var AssetstoreModelBase
245-
*/
247+
* Assetstrore Model
248+
* @var AssetstoreModelBase
249+
*/
246250
var $Assetstore;
247251
/**
248-
* Bitstream Model
249-
* @var BitstreamModelBase
250-
*/
252+
* Bitstream Model
253+
* @var BitstreamModelBase
254+
*/
251255
var $Bitstream;
252256
/**
253-
* Community Model
254-
* @var CommunityModelBase
255-
*/
257+
* Community Model
258+
* @var CommunityModelBase
259+
*/
256260
var $Community;
257261
/**
258-
* Errorlog Model
259-
* @var ErrorlogModelBase
260-
*/
262+
* Errorlog Model
263+
* @var ErrorlogModelBase
264+
*/
261265
var $Errorlog;
262266
/**
263-
* Feed Model
264-
* @var FeedModelBase
265-
*/
267+
* Feed Model
268+
* @var FeedModelBase
269+
*/
266270
var $Feed;
267271
/**
268-
* Feedpolicygroup Model
269-
* @var FeedpolicygroupModelBase
270-
*/
272+
* Feedpolicygroup Model
273+
* @var FeedpolicygroupModelBase
274+
*/
271275
var $Feedpolicygroup;
272-
/**
273-
* Feedpolicyuser Model
274-
* @var FeedpolicyuserModelBase
275-
*/
276+
/**
277+
* Feedpolicyuser Model
278+
* @var FeedpolicyuserModelBase
279+
*/
276280
var $Feedpolicyuser;
277281
/**
278-
* Folder Model
279-
* @var FolderModelBase
280-
*/
282+
* Folder Model
283+
* @var FolderModelBase
284+
*/
281285
var $Folder;
282286
/**
283-
* Folderpolicygroup Model
284-
* @var FolderpolicygroupModelBase
285-
*/
287+
* Folderpolicygroup Model
288+
* @var FolderpolicygroupModelBase
289+
*/
286290
var $Folderpolicygroup;
287-
/**
288-
* Folderpolicyuser Model
289-
* @var FolderpolicyuserModelBase
290-
*/
291+
/**
292+
* Folderpolicyuser Model
293+
* @var FolderpolicyuserModelBase
294+
*/
291295
var $Folderpolicyuser;
292296
/**
293-
* Group Model
294-
* @var GroupModelBase
295-
*/
297+
* Group Model
298+
* @var GroupModelBase
299+
*/
296300
var $Group;
297-
/**
298-
* ItemKeyword Model
299-
* @var ItemKeywordModelBase
300-
*/
301+
/**
302+
* ItemKeyword Model
303+
* @var ItemKeywordModelBase
304+
*/
301305
var $ItemKeyword;
302306
/**
303-
* Item Model
304-
* @var ItemModelBase
305-
*/
307+
* Item Model
308+
* @var ItemModelBase
309+
*/
306310
var $Item;
307311
/**
308-
* Itempolicygroup Model
309-
* @var ItempolicygroupModelBase
310-
*/
312+
* Itempolicygroup Model
313+
* @var ItempolicygroupModelBase
314+
*/
311315
var $Itempolicygroup;
312-
/**
313-
* Itempolicyuser Model
314-
* @var ItempolicyuserModelBase
315-
*/
316+
/**
317+
* Itempolicyuser Model
318+
* @var ItempolicyuserModelBase
319+
*/
316320
var $Itempolicyuser;
317321
/**
318-
* ItemRevision Model
319-
* @var ItemRevisionModelBase
320-
*/
322+
* ItemRevision Model
323+
* @var ItemRevisionModelBase
324+
*/
321325
var $ItemRevision;
322-
/**
323-
* User Model
324-
* @var UserModelBase
325-
*/
326+
/**
327+
* User Model
328+
* @var UserModelBase
329+
*/
326330
var $User;
327331

328332
/**end completion eclipse */

‎core/AppForm.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public function __construct()
1010
}//end construct
1111

1212

13-
/** translation */
13+
/** translation */
1414
protected function t($text)
1515
{
1616
Zend_Loader::loadClass("InternationalizationComponent", BASE_PATH.'/core/controllers/components');

‎core/Bootstrap.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ protected function _initConfig()
5555
$configDatabase = new Zend_Config_Ini(DATABASE_CONFIG, $configGlobal->environment, true);
5656
if($configDatabase->database->type == 'pdo')
5757
{
58-
$pdoParams = array(
59-
PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true);
58+
$pdoParams = array(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true);
6059
$params = array(
6160
'host' => $configDatabase->database->params->host,
6261
'username' => $configDatabase->database->params->username,
@@ -100,7 +99,7 @@ protected function _initConfig()
10099
$writerDb = new Zend_Log_Writer_Db($db, 'errorlog', $columnMapping);
101100
if($config->error->php == 1)
102101
{
103-
new Zend_Log_Formatter_Simple();
102+
$formatter = new Zend_Log_Formatter_Simple();
104103
Zend_Loader_Autoloader::getInstance()->suppressNotFoundWarnings(false);
105104
$logger = Zend_Log::factory(array(
106105
array(
@@ -204,7 +203,7 @@ protected function _initRouter()
204203
{
205204
require_once BASE_PATH . "/modules/".$route."/models/AppModel.php";
206205
}
207-
}
206+
}
208207
Zend_Registry::set('modulesEnable', $listeModule);
209208
return $router;
210209
}

‎core/configs/database.local.ini.test‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎core/constant/notification.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?php
2+
define("MIDAS_NOTIFY_LOGIN", 0);
3+
?>

‎core/controllers/UserController.php‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,22 @@ function loginAction()
135135
$previousUri=$this->_getParam('previousuri');
136136
if($form->isValid($this->getRequest()->getPost()))
137137
{
138-
$userDao=$this->User->getByEmail($form->getValue('email'));
138+
$notifications = Zend_Registry::get('notifier')->notify(MIDAS_NOTIFY_LOGIN,array('email' => $form->getValue('email'), 'password' => $form->getValue('password')));
139+
140+
if(!empty($notifications['ldap']) && $notifications['ldap'] != false)
141+
{
142+
$userDao = $notifications['ldap'];
143+
$authLdap = true;
144+
}
145+
else
146+
{
147+
$userDao = $this->User->getByEmail($form->getValue('email'));
148+
$authLdap = false;
149+
}
150+
151+
139152
$passwordPrefix=Zend_Registry::get('configGlobal')->password->prefix;
140-
if($userDao != false && md5($passwordPrefix.$form->getValue('password')) == $userDao->getPassword())
153+
if($authLdap || $userDao != false && md5($passwordPrefix.$form->getValue('password')) == $userDao->getPassword())
141154
{
142155
$remember=$form->getValue('remerberMe');
143156
if(isset($remember) && $remember == 1)
@@ -217,6 +230,13 @@ public function validentryAction()
217230
echo 'false';
218231
return;
219232
}
233+
234+
$notifications = Zend_Registry::get('notifier')->notify(MIDAS_NOTIFY_LOGIN,array('email' => $entry, 'password' => $password));
235+
if(!empty($notifications['ldap']) && $notifications['ldap'] != false)
236+
{
237+
echo "true";
238+
return;
239+
}
220240
$passwordPrefix=Zend_Registry::get('configGlobal')->password->prefix;
221241
$userDao=$this->User->getByEmail($entry);
222242
if($userDao != false && md5($passwordPrefix.$password) == $userDao->getPassword())

‎core/include.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
include_once BASE_PATH.'/core/constant/folder.php';
1717
include_once BASE_PATH.'/core/constant/feed.php';
1818
include_once BASE_PATH.'/core/constant/license.php';
19+
include_once BASE_PATH.'/core/constant/notification.php';
1920
include_once BASE_PATH.'/core/constant/user.php';
2021
include_once BASE_PATH.'/core/constant/resourcetype.php';
2122
include_once BASE_PATH.'/core/constant/task.php';

‎core/models/base/AssetstoreModelBase.php‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
<?php
2+
/** Assetstore Model Base*/
23
abstract class AssetstoreModelBase extends AppModel
34
{
5+
/** Constructor*/
46
public function __construct()
57
{
68
parent::__construct();
79
$this->_name = 'assetstore';
810
$this->_key = 'assetstore_id';
911

10-
$this->_mainData= array(
11-
'assetstore_id'=> array('type'=>MIDAS_DATA),
12-
'name'=> array('type'=>MIDAS_DATA),
13-
'path'=> array('type'=>MIDAS_DATA),
14-
'type' => array('type'=>MIDAS_DATA),
12+
$this->_mainData = array(
13+
'assetstore_id' => array('type' => MIDAS_DATA),
14+
'name' => array('type' => MIDAS_DATA),
15+
'path' => array('type' => MIDAS_DATA),
16+
'type' => array('type' => MIDAS_DATA),
1517
);
1618
$this->initialize(); // required
1719
} // end __construct()
1820

1921
/** Abstract functions */
2022
abstract function getAll();
2123

22-
} // end class AssetstoreModelBase
23-
?>
24+
} // end class AssetstoreModelBase

0 commit comments

Comments
 (0)