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

Commit b652531

Browse files
author
Charles Marion
committed
ENH: fixed installation
1 parent 989eece commit b652531

File tree

9 files changed

+30
-18
lines changed

9 files changed

+30
-18
lines changed

‎core/controllers/InstallController.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,8 @@ function step2Action()
184184
$databaseConfig['production']['version']=str_replace('.sql', '', basename($sqlFile));
185185
$databaseConfig['development']['version']=str_replace('.sql', '', basename($sqlFile));
186186

187+
$this->Component->Utility->createInitFile(BASE_PATH.'/core/configs/database.local.ini',$databaseConfig);
188+
187189
require_once BASE_PATH.'/core/controllers/components/UpgradeComponent.php';
188190
$upgradeComponent=new UpgradeComponent();
189191
$db = Zend_Registry::get('dbAdapter');
@@ -192,7 +194,7 @@ function step2Action()
192194
$upgradeComponent->initUpgrade('core', $db, $dbtype);
193195
$upgradeComponent->upgrade(str_replace('.sql', '', basename($sqlFile)));
194196

195-
$this->Component->Utility->createInitFile(BASE_PATH.'/core/configs/database.local.ini',$databaseConfig);
197+
196198

197199
$this->User=new UserModel(); //reset Database adapter
198200
$this->userSession->Dao=$this->User->createUser($form->getValue('email'),$form->getValue('userpassword1'),

‎core/controllers/SearchController.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class SearchController extends AppController
77
{
88
public $_models=array('ItemKeyword','Item','Folder','User','Community','Group');
99
public $_daos=array('ItemKeyword','Item','Folder','User','Community');
10-
public $_components=array('Sortdao','Date');
10+
public $_components=array('Sortdao','Date','Utility');
1111

1212
/** Init Controller */
1313
function init()
@@ -255,7 +255,7 @@ public function liveAction()
255255
}
256256
echo '{';
257257
echo '"id":"'.$id.'"';
258-
echo ', "label":"'.$itemDao->getName();
258+
echo ', "label":"'.$this->Component->Utility->sliceName($itemDao->getName(),55);
259259
if($itemDao->count>1)
260260
{
261261
echo ' ('.$itemDao->count.')"';
@@ -271,7 +271,7 @@ public function liveAction()
271271
{
272272
echo ', "itemid":"'.$itemDao->getItemId().'"';
273273
}
274-
echo ', "category":"Items"';
274+
echo ', "category":"'.$this->t('Items').'"';
275275
$id++;
276276
$n++;
277277
echo '}';
@@ -289,11 +289,11 @@ public function liveAction()
289289
}
290290
echo '{';
291291
echo '"id":"'.$id.'"';
292-
echo ', "label":"'.$groupDao->getName();
292+
echo ', "label":"'.$this->Component->Utility->sliceName($groupDao->getName(),55);
293293
echo '"';
294294
echo ', "value":"'.$groupDao->getName().'"';
295295
echo ', "groupid":"'.$groupDao->getKey().'"';
296-
echo ', "category":"Groups"';
296+
echo ', "category":"'.$this->t('Groups').'"';
297297
$id++;
298298
$n++;
299299
echo '}';
@@ -313,7 +313,7 @@ public function liveAction()
313313
}
314314
echo '{';
315315
echo '"id":"'.$id.'"';
316-
echo ', "label":"'.$folderDao->getName();
316+
echo ', "label":"'.$this->Component->Utility->sliceName($folderDao->getName(),55);
317317
if($folderDao->count>1)
318318
{
319319
echo ' ('.$folderDao->count.')"';
@@ -327,7 +327,7 @@ public function liveAction()
327327
{
328328
echo ', "folderid":"'.$folderDao->getFolderId().'"';
329329
}
330-
echo ', "category":"Folders"';
330+
echo ', "category":"'.$this->t('Folders').'"';
331331
$id++;
332332
$n++;
333333
echo '}';
@@ -347,7 +347,7 @@ public function liveAction()
347347
}
348348
echo '{';
349349
echo '"id":"'.$id.'"';
350-
echo ', "label":"'.$communityDao->getName();
350+
echo ', "label":"'.$this->Component->Utility->sliceName($communityDao->getName(),55);
351351
if($communityDao->count>1)
352352
{
353353
echo ' ('.$communityDao->count.')"';
@@ -361,7 +361,7 @@ public function liveAction()
361361
{
362362
echo ', "communityid":"'.$communityDao->getKey().'"';
363363
}
364-
echo ', "category":"Communities"';
364+
echo ', "category":"'.$this->t('Communities').'"';
365365
$id++;
366366
$n++;
367367
echo '}';
@@ -395,7 +395,7 @@ public function liveAction()
395395
{
396396
echo ', "userid":"'.$userDao->getUserId().'"';
397397
}
398-
echo ', "category":"Users"';
398+
echo ', "category":"'.$this->t('Users').'"';
399399
$id++;
400400
$n++;
401401
echo '}';

‎core/controllers/UserController.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ function loginAction()
139139
if($userDao != false && md5($passwordPrefix.$form->getValue('password')) == $userDao->getPassword())
140140
{
141141
$remember=$form->getValue('remerberMe');
142-
143142
if(isset($remember) && $remember == 1)
144143
{
145144
$seconds=60 * 60 * 24 * 14; // 14 days

‎core/controllers/components/UtilityComponent.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ static public function createInitFile($path,$data)
6666
}
6767
if(file_exists($path))
6868
{
69-
unset($path);
69+
unlink($path);
7070
}
7171

7272
if(!is_array($data)||empty($data))

‎core/public/css/layout/main.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,7 @@ div.TopbarRight li:hover ul{
470470
display:block;
471471
}
472472

473+
473474
div.TopbarRight img.arrowUser{
474475
position:relative;
475476
top:1px;
@@ -481,10 +482,12 @@ div.TopbarRight li li {
481482
padding:0px;
482483
position:relative;
483484
left:-3px;
485+
z-index:200;
484486
}
485487
div.TopbarRight li:hover li a{
486488
background:#4B4B4B;
487489
color:white;
490+
z-index:200;
488491

489492
}
490493

@@ -502,6 +505,7 @@ div.TopbarRight li ul a{
502505
-webkit-box-shadow: #666 0 0 5px;
503506
box-shadow: #666 0 0 5px;
504507
-moz-box-shadow: 0px 0px 5px #666;
508+
z-index:200;
505509

506510
}
507511
div.TopbarRight li ul a:hover, div.TopbarRight li ul li:hover a{

‎core/public/js/layout/main.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ $(function() {
4444
loadAjaxDynamicBar('login','/user/login');
4545
}
4646

47+
//menu
48+
$('div.TopbarRighta li.first').hover(
49+
function() { $('ul', this).css('display', 'block'); },
50+
function() { $('ul', this).css('display', 'none'); });
51+
4752
// If we are not logged in
4853
if(json.global.needToLog)
4954
{

‎core/public/js/search/search.index.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,28 +132,28 @@ function createSearchResults(element)
132132
if(element.resultType=='user')
133133
{
134134
html="<img class='imageSearchResult' alt='' src='"+json.global.coreWebroot+"/public/images/icons/unknownUser-small.png'/>";
135-
html+="<a class='nameSearchResult' href='"+json.global.webroot+"/user/"+element.user_id+"'>"+element.firstname+' '+element.lastname+"</a><br/>";
135+
html+="<a class='nameSearchResult' href='"+json.global.webroot+"/user/"+element.user_id+"'>"+element.firstname+' '+sliceFileName(element.name, 45)+"</a><br/>";
136136
html+="<span class='descriptionSearchResult' >"+element.company+"</span>";
137137
html+="<span class='dateSearchResult' >"+element.formattedDate+"</span>";
138138
}
139139
if(element.resultType=='item')
140140
{
141141
html="<img class='imageSearchResult' alt='' src='"+json.global.coreWebroot+"/public/images/FileTree/txt.png'/>";
142-
html+="<a class='nameSearchResult' href='"+json.global.webroot+"/item/"+element.item_id+"'>"+element.name+"</a><br/>";
142+
html+="<a class='nameSearchResult' href='"+json.global.webroot+"/item/"+element.item_id+"'>"+sliceFileName(element.name, 45)+"</a><br/>";
143143
html+="<span class='descriptionSearchResult' >"+element.description+"</span>";
144144
html+="<span class='dateSearchResult' >"+element.formattedDate+"</span>";
145145
}
146146
if(element.resultType=='folder')
147147
{
148148
html="<img class='imageSearchResult' alt='' src='"+json.global.coreWebroot+"/public/images/FileTree/directory.png'/>";
149-
html+="<a class='nameSearchResult' href='"+json.global.webroot+"/folder/"+element.folder_id+"'>"+element.name+"</a><br/>";
149+
html+="<a class='nameSearchResult' href='"+json.global.webroot+"/folder/"+element.folder_id+"'>"+sliceFileName(element.name, 45)+"</a><br/>";
150150
html+="<span class='descriptionSearchResult' >"+element.description+"</span>";
151151
html+="<span class='dateSearchResult' >"+element.formattedDate+"</span>";
152152
}
153153
if(element.resultType=='community')
154154
{
155155
html="<img class='imageSearchResult' alt='' src='"+json.global.coreWebroot+"/public/images/icons/community.png'/>";
156-
html+="<a class='nameSearchResult' href='"+json.global.webroot+"/community/"+element.community_id+"'>"+element.name+"</a><br/>";
156+
html+="<a class='nameSearchResult' href='"+json.global.webroot+"/community/"+element.community_id+"'>"+sliceFileName(element.name, 45)+"</a><br/>";
157157
html+="<span class='descriptionSearchResult' >"+element.description+"</span>";
158158
html+="<span class='dateSearchResult' >"+element.formattedDate+"</span>";
159159
}

‎core/translation/fr-main.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,4 +213,4 @@ Everyone can join the community;Tout le monde peut rejoindre la communaut
213213
Only invited users can join the community;Seulement les utilisateurs invit�s peuvent rejoindre la communaut�
214214
Last revision content;Contenu de la derni�re r�vision
215215
Upload new Revision;Ajouter nouvelle R�vision
216-
added a new revision to;a ajout� une nouvelle r�vision �
216+
added a new revision to;a ajout� une nouvelle r�vision �

‎index.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
exit();
3333
}
3434

35+
// remember me cookie lifetime
36+
//ini_set('session.gc_maxlifetime', 60 * 60 * 24 * 15); //15 days
3537
define('START_TIME',microtime(true));
3638

3739
require_once 'Zend/Loader/Autoloader.php';

0 commit comments

Comments
 (0)