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

Commit 750841e

Browse files
author
Charles Marion
committed
BUG: Fixed Midas library style
1 parent be18c3c commit 750841e

21 files changed

+338
-325
lines changed

‎core/controllers/AdminController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ function showlogAction()
201201
$logs = $this->Errorlog->getLog($start, $end, $module, $priority);
202202
foreach($logs as $key => $log)
203203
{
204-
$logs[$key] = $log->_toArray();
204+
$logs[$key] = $log->toArray();
205205
if(substr($log->getMessage(), 0, 5) == 'Fatal')
206206
{
207207
$shortMessage = substr($log->getMessage(), strpos($log->getMessage(), "[message]") + 10, 40);

‎core/controllers/BrowseController.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -283,23 +283,23 @@ public function getelementinfoAction()
283283
{
284284
case 'community':
285285
$community=$this->Community->load($id);
286-
$jsonContent=array_merge($jsonContent,$community->_toArray());
286+
$jsonContent=array_merge($jsonContent,$community->toArray());
287287
$jsonContent['creation']=$this->Component->Date->formatDate(strtotime($community->getCreation()));
288288
$members=$community->getMemberGroup()->getUsers();
289289
$jsonContent['members']=count($members);
290290
break;
291291
case 'folder':
292292
$folder=$this->Folder->load($id);
293-
$jsonContent=array_merge($jsonContent,$folder->_toArray());
293+
$jsonContent=array_merge($jsonContent,$folder->toArray());
294294
$jsonContent['creation']=$this->Component->Date->formatDate(strtotime($jsonContent['date']));
295295
break;
296296
case 'item':
297297
$item=$this->Item->load($id);
298-
$jsonContent=array_merge($jsonContent,$item->_toArray());
298+
$jsonContent=array_merge($jsonContent,$item->toArray());
299299
$itemRevision=$this->Item->getLastRevision($item);
300300
$jsonContent['creation']=$this->Component->Date->formatDate(strtotime($itemRevision->getDate()));
301-
$jsonContent['uploaded']=$itemRevision->getUser()->_toArray();
302-
$jsonContent['revision']=$itemRevision->_toArray();
301+
$jsonContent['uploaded']=$itemRevision->getUser()->toArray();
302+
$jsonContent['revision']=$itemRevision->toArray();
303303
$jsonContent['nbitstream']=count($itemRevision->getBitstreams());
304304
$jsonContent['type']='item';
305305
break;

‎core/controllers/CommunityController.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ function manageAction()
111111
if($this->_getParam('groupId')==0)
112112
{
113113
$new_group=$this->Group->createGroup($communityDao,$formCreateGroup->getValue('name'));
114-
echo JsonComponent::encode(array(true,$this->t('Changes saved'),$new_group->_toArray()));
114+
echo JsonComponent::encode(array(true,$this->t('Changes saved'),$new_group->toArray()));
115115
}
116116
else
117117
{
@@ -122,7 +122,7 @@ function manageAction()
122122
}
123123
$group->setName($formCreateGroup->getValue('name'));
124124
$this->Group->save($group);
125-
echo JsonComponent::encode(array(true,$this->t('Changes saved'),$group->_toArray()));
125+
echo JsonComponent::encode(array(true,$this->t('Changes saved'),$group->toArray()));
126126
}
127127
}
128128
else
@@ -192,7 +192,7 @@ function manageAction()
192192
$this->view->communityDao=$communityDao;
193193

194194
$this->view->isAdmin=$this->Community->policyCheck($communityDao, $this->userSession->Dao,MIDAS_POLICY_ADMIN);
195-
$this->view->json['community']=$communityDao->_toArray();
195+
$this->view->json['community']=$communityDao->toArray();
196196
$this->view->json['community']['message']['delete']=$this->t('Delete');
197197
$this->view->json['community']['message']['deleteMessage']=$this->t('Do you really want to delete this community? It cannot be undo.');
198198
$this->view->json['community']['message']['deleteGroupMessage']=$this->t('Do you really want to delete this group? It cannot be undo.');
@@ -277,7 +277,7 @@ function viewAction()
277277
}
278278
$this->view->isModerator=$this->Community->policyCheck($communityDao, $this->userSession->Dao,MIDAS_POLICY_WRITE);
279279
$this->view->isAdmin=$this->Community->policyCheck($communityDao, $this->userSession->Dao,MIDAS_POLICY_ADMIN);
280-
$this->view->json['community']=$communityDao->_toArray();
280+
$this->view->json['community']=$communityDao->toArray();
281281

282282
if($this->view->isMember)
283283
{

‎core/controllers/FolderController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public function deleteAction()
163163
throw new Zend_Exception("User Folder. You cannot delete it.");
164164
}
165165
$this->Folder->delete($folder);
166-
$folderInfo=$folder->_toArray();
166+
$folderInfo=$folder->toArray();
167167
echo JsonComponent::encode(array(true,$this->t('Changes saved'),$folderInfo));
168168
}// end deleteAction
169169

@@ -257,7 +257,7 @@ public function createfolderAction()
257257
}
258258
else
259259
{
260-
echo JsonComponent::encode(array(true,$this->t('Changes saved'),$folder->_toArray(),$new_folder->_toArray()));
260+
echo JsonComponent::encode(array(true,$this->t('Changes saved'),$folder->toArray(),$new_folder->toArray()));
261261
}
262262
}
263263
}

‎core/controllers/ItemController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ function viewAction()
8888

8989
$this->view->itemSize=$this->Component->Utility->formatSize($itemDao->getSizebytes());
9090

91-
$this->view->json['item']=$itemDao->_toArray();
91+
$this->view->json['item']=$itemDao->toArray();
9292
$this->view->json['item']['message']['delete']=$this->t('Delete');
9393
$this->view->json['item']['message']['deleteMessage']=$this->t('Do you really want to delete this item? It cannot be undo.');
9494
$this->view->json['item']['message']['movecopy']=$this->t('Copy Item.');

‎core/controllers/SearchController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ private function formatResults($order,$items,$folders,$communities,$users)
117117
$resultsArray=array();
118118
foreach ($results as $result)
119119
{
120-
$tmp=$result->_toArray();
120+
$tmp=$result->toArray();
121121
if($result instanceof UserDao)
122122
{
123123
$tmp['resultType']='user';

‎library/MIDAS/component/GlobalComponent.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,4 @@ public function getLogger()
1616
return Zend_Registry::get('logger');
1717
}
1818

19-
} // end class
20-
21-
?>
19+
} // end class

‎library/MIDAS/controller/GlobalController.php‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ class MIDAS_GlobalController extends Zend_Controller_Action
1010
protected $Models = array();
1111
protected $ModelLoader = null;
1212

13+
/** contructor*/
1314
public function __construct(Zend_Controller_Request_Abstract $request, Zend_Controller_Response_Abstract $response, array $invokeArgs = array())
1415
{
15-
if ($this->isDebug())
16+
if($this->isDebug())
1617
{
1718
$this->_controllerTimer = microtime(true);
1819
}
@@ -28,63 +29,63 @@ public function __construct(Zend_Controller_Request_Abstract $request, Zend_Cont
2829
public function preDispatch()
2930
{
3031
// Init the translater
31-
if (!$this->isDebug())
32+
if(!$this->isDebug())
3233
{
33-
$frontendOptions=array(
34-
'lifetime'=>86400,'automatic_serialization'=>true
34+
$frontendOptions = array(
35+
'lifetime' => 86400, 'automatic_serialization' => true
3536
);
3637

37-
$backendOptions=array(
38-
'cache_dir'=>BASE_PATH.'/tmp/cache/translation'
38+
$backendOptions = array(
39+
'cache_dir' => BASE_PATH.'/tmp/cache/translation'
3940
);
40-
$cache=Zend_Cache::factory('Core','File',$frontendOptions,$backendOptions);
41+
$cache = Zend_Cache::factory('Core', 'File', $frontendOptions, $backendOptions);
4142
Zend_Translate::setCache($cache);
4243
}
43-
$translate=new Zend_Translate('csv',BASE_PATH.'/core/translation/fr-main.csv','en');
44-
Zend_Registry::set('translater',$translate);
44+
$translate = new Zend_Translate('csv', BASE_PATH.'/core/translation/fr-main.csv', 'en');
45+
Zend_Registry::set('translater', $translate);
4546

46-
$translaters=array();
47-
$configs=array();
48-
$modulesEnable= Zend_Registry::get('modulesEnable');
47+
$translaters = array();
48+
$configs = array();
49+
$modulesEnable = Zend_Registry::get('modulesEnable');
4950
foreach($modulesEnable as $module)
5051
{
51-
$translaters[$module]=new Zend_Translate('csv',BASE_PATH."/modules/$module/translation/fr-main.csv","en");
52-
if(file_exists(BASE_PATH."/modules/$module/configs/module.local.ini"))
52+
$translaters[$module] = new Zend_Translate('csv', BASE_PATH."/modules/".$module."/translation/fr-main.csv", "en");
53+
if(file_exists(BASE_PATH."/modules/".$module."/configs/module.local.ini"))
5354
{
54-
$configs[$module]= new Zend_Config_Ini(BASE_PATH."/modules/$module/configs/module.local.ini", 'global');
55+
$configs[$module] = new Zend_Config_Ini(BASE_PATH."/modules/".$module."/configs/module.local.ini", 'global');
5556
}
5657
else
5758
{
58-
$configs[$module]= new Zend_Config_Ini(BASE_PATH."/modules/$module/configs/module.ini", 'global');
59+
$configs[$module] = new Zend_Config_Ini(BASE_PATH."/modules/".$module."/configs/module.ini", 'global');
5960
}
6061
}
61-
Zend_Registry::set('translatersModules',$translaters);
62-
Zend_Registry::set('configsModules',$configs);
62+
Zend_Registry::set('translatersModules', $translaters);
63+
Zend_Registry::set('configsModules', $configs);
6364

64-
$forward=$this->_getParam("forwardModule");
65+
$forward = $this->_getParam("forwardModule");
6566
$request = $this->getRequest();
6667
$response = $this->getResponse();
6768
if(!isset($forward))
6869
{
6970
foreach($configs as $key => $config)
7071
{
71-
if($config->system==1)
72+
if($config->system == 1)
7273
{
7374
if(file_exists(BASE_PATH.'/modules/'.$key.'/controllers/'. ucfirst($request->getControllerName()).'CoreController.php'))
7475
{
7576
include_once BASE_PATH.'/modules/'.$key.'/controllers/'. ucfirst($request->getControllerName()).'CoreController.php';
76-
$name=ucfirst($key).'_'.ucfirst($request->getControllerName()).'CoreController';
77-
$controller=new $name($request,$response);
77+
$name = ucfirst($key).'_'.ucfirst($request->getControllerName()).'CoreController';
78+
$controller = new $name($request, $response);
7879
if(method_exists($controller, $request->getActionName().'Action'))
7980
{
80-
$this->_forward($request->getActionName(), $request->getControllerName().'Core', $key,array('forwardModule'=>true));
81+
$this->_forward($request->getActionName(), $request->getControllerName().'Core', $key, array('forwardModule' => true));
8182
}
8283
}
8384
}
8485
}
8586
}
8687
parent::preDispatch();
87-
if (!$this->isDebug())
88+
if(!$this->isDebug())
8889
{
8990
$frontendOptions = array(
9091
'lifetime' => 86400,
@@ -117,17 +118,17 @@ public function postDispatch()
117118
{
118119

119120
parent::postDispatch();
120-
if ($this->isDebug() && $this->getEnvironment() != 'testing')
121+
if($this->isDebug() && $this->getEnvironment() != 'testing')
121122
{
122-
$time_end = microtime(true);
123+
$timeEnd = microtime(true);
123124
$writer = new Zend_Log_Writer_Firebug();
124125
$logger = new Zend_Log($writer);
125-
$logger->info("---Timers--- Controller timer:" . round(1000*($time_end - $this->_controllerTimer),3)." ms - Global timer:" . round(1000*($time_end - START_TIME),3)." ms");
126+
$logger->info("---Timers--- Controller timer:" . round(1000 * ($timeEnd - $this->_controllerTimer), 3)." ms - Global timer:" . round(1000 * ($timeEnd - START_TIME), 3)." ms");
126127

127-
$logger->info("---Memory Usage---".round((memory_get_usage() / (1024 * 1024)),3) . " MB");
128+
$logger->info("---Memory Usage---".round((memory_get_usage() / (1024 * 1024)), 3) . " MB");
128129
}
129130

130-
if (Zend_Registry::get("configDatabase")->database->profiler == 1)
131+
if(Zend_Registry::get("configDatabase")->database->profiler == 1)
131132
{
132133
$this->showProfiler();
133134
}
@@ -156,14 +157,14 @@ public function loadElements()
156157
$this->ModelLoader->loadModels($this->_models);
157158
}
158159
$modelsArray = Zend_Registry::get('models');
159-
foreach ($modelsArray as $key => $tmp)
160+
foreach($modelsArray as $key => $tmp)
160161
{
161162
$this->$key = $tmp;
162163
}
163164

164165
if(isset($this->_daos))
165166
{
166-
foreach ($this->_daos as $dao)
167+
foreach($this->_daos as $dao)
167168
{
168169
Zend_Loader::loadClass($dao . "Dao", BASE_PATH . '/core/models/dao');
169170
}
@@ -173,7 +174,7 @@ public function loadElements()
173174

174175
if(isset($this->_components))
175176
{
176-
foreach ($this->_components as $component)
177+
foreach($this->_components as $component)
177178
{
178179
$nameComponent = $component . "Component";
179180
Zend_Loader::loadClass($nameComponent, BASE_PATH . '/core/controllers/components');
@@ -184,7 +185,7 @@ public function loadElements()
184185
Zend_Registry::set('forms', array());
185186
if(isset($this->_forms))
186187
{
187-
foreach ($this->_forms as $forms)
188+
foreach($this->_forms as $forms)
188189
{
189190
$nameForm = $forms . "Form";
190191

@@ -202,45 +203,45 @@ public function showProfiler()
202203
$writer = new Zend_Log_Writer_Firebug();
203204
$logger = new Zend_Log($writer);
204205
$configDatabase = Zend_Registry::get('configDatabase');
205-
if ($configDatabase->database->profiler != '1')
206+
if($configDatabase->database->profiler != '1')
206207
{
207208
return;
208209
}
209210
$db = Zend_Registry::get('dbAdapter');
210211

211-
if(method_exists($db,"getProfiler"))
212+
if(method_exists($db, "getProfiler"))
212213
{
213214
$profiler = $db->getProfiler();
214215
$totalTime = $profiler->getTotalElapsedSecs();
215216
$queryCount = $profiler->getTotalNumQueries();
216-
if ($queryCount == 0)
217+
if($queryCount == 0)
217218
{
218219
return;
219220
}
220221
}
221222

222223
$longestTime = 0;
223224
$longestQuery = null;
224-
if(isset($profiler)&&!empty($profiler))
225+
if(isset($profiler) && !empty($profiler))
225226
{
226-
$querys=$profiler->getQueryProfiles();
227+
$querys = $profiler->getQueryProfiles();
227228
if(!empty($querys))
228229
{
229-
foreach ($profiler->getQueryProfiles() as $query)
230+
foreach($profiler->getQueryProfiles() as $query)
230231
{
231-
if ($query->getElapsedSecs() > $longestTime)
232+
if($query->getElapsedSecs() > $longestTime)
232233
{
233234
$longestTime = $query->getElapsedSecs();
234235
$longestQuery = $query->getQuery();
235236
}
236237
}
237-
$stats='--- Profiler --- Executed ' . $queryCount . ' queries in ' . round(1000*$totalTime,3) .' ms';
238-
$stats.= ' Longest query length: ' . round(1000*$longestTime,3).' ms : '.$longestQuery;
239-
$logger->log(str_replace("'","`",$stats), Zend_Log::INFO);
238+
$stats = '--- Profiler --- Executed ' . $queryCount . ' queries in ' . round(1000 * $totalTime, 3) .' ms';
239+
$stats .= ' Longest query length: ' . round(1000 * $longestTime, 3).' ms : '.$longestQuery;
240+
$logger->log(str_replace("'", "`", $stats), Zend_Log::INFO);
240241

241-
foreach ($profiler->getQueryProfiles() as $query)
242+
foreach($profiler->getQueryProfiles() as $query)
242243
{
243-
$logger->log(str_replace("'","`",round(1000*($query->getElapsedSecs()),3). " ms | " . $query->getQuery()), Zend_Log::INFO);
244+
$logger->log(str_replace("'", "`", round(1000 * ($query->getElapsedSecs()), 3). " ms | " . $query->getQuery()), Zend_Log::INFO);
244245
}
245246
}
246247
}
@@ -254,7 +255,7 @@ public function showProfiler()
254255
public function isDebug()
255256
{
256257
$config = Zend_Registry::get('config');
257-
if ($config->mode->debug == 1)
258+
if($config->mode->debug == 1)
258259
{
259260
return true;
260261
}
@@ -291,14 +292,13 @@ public function getFormAsArray(Zend_Form $form)
291292
$array = array();
292293
$array['action'] = $form->getAction();
293294
$array['method'] = $form->getMethod();
294-
foreach ( $form->getElements() as $element ) {
295-
$element->removeDecorator('HtmlTag');
296-
$element->removeDecorator('Label');
297-
$element->removeDecorator('DtDdWrapper');
298-
$array[$element->getName()] = $element;
299-
}
295+
foreach($form->getElements() as $element )
296+
{
297+
$element->removeDecorator('HtmlTag');
298+
$element->removeDecorator('Label');
299+
$element->removeDecorator('DtDdWrapper');
300+
$array[$element->getName()] = $element;
301+
}
300302
return $array;
301-
}
302-
303-
} // end class
304-
?>
303+
}
304+
} // end class

‎library/MIDAS/filter/GlobalFilter.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,4 @@ public function getLogger()
1616
return Zend_Registry::get('logger');
1717
}
1818

19-
} // end class
20-
21-
?>
19+
} // end class

0 commit comments

Comments
 (0)