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

Commit 2bb661a

Browse files
author
Charles Marion
committed
ENH: moved public
1 parent 4325bb2 commit 2bb661a

File tree

254 files changed

+228
-188
lines changed

Some content is hidden

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

254 files changed

+228
-188
lines changed

core/AppController.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ public function preDispatch()
1717
$this->view->setEncoding('iso-8859-1');
1818
$fc=Zend_Controller_Front::getInstance();
1919
$this->view->webroot=$fc->getBaseUrl();
20+
$this->coreWebroot=$this->view->webroot.'/core';
21+
$this->view->coreWebroot=$this->coreWebroot;
2022

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

@@ -66,6 +68,7 @@ public function preDispatch()
6668
//create a global javascript json array
6769
$jsonGlobal=array(
6870
"webroot"=>$this->view->webroot,
71+
"coreWebroot"=>$this->view->coreWebroot,
6972
"logged"=>$this->logged,
7073
"currentUri"=>$this->getRequest()->REQUEST_URI,
7174
"lang"=>Zend_Registry::get('configGlobal')->application->lang,
File renamed without changes.

core/constant/.htaccess

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
2+
Order Allow,Deny
3+
Deny from all

core/controllers/.htaccess

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
2+
Order Allow,Deny
3+
Deny from all

core/controllers/FolderController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,24 +44,24 @@ public function viewAction()
4444
{
4545
$items[$key]->size=$this->Component->Utility->formatSize($i->getSizebytes());
4646
}
47-
$header.=" <li class='pathFolder'><img alt='' src='{$this->view->webroot}/public/images/FileTree/folder_open.png' /><span><a href='{$this->view->webroot}/folder/{$folder->getKey()}'>{$folder->getName()}</a></span></li>";
47+
$header.=" <li class='pathFolder'><img alt='' src='{$this->view->coreWebroot}/public/images/FileTree/folder_open.png' /><span><a href='{$this->view->webroot}/folder/{$folder->getKey()}'>{$folder->getName()}</a></span></li>";
4848
$parent=$folder->getParent();
4949
while($parent!==false)
5050
{
5151
if(strpos($parent->getName(), 'community')!==false&&$this->Folder->getCommunity($parent)!==false)
5252
{
5353
$community=$this->Folder->getCommunity($parent);
54-
$header=" <li class='pathCommunity'><img alt='' src='{$this->view->webroot}/public/images/icons/community.png' /><span><a href='{$this->view->webroot}/community/{$community->getKey()}'>{$community->getName()}</a></span></li>".$header;
54+
$header=" <li class='pathCommunity'><img alt='' src='{$this->view->coreWebroot}/public/images/icons/community.png' /><span><a href='{$this->view->webroot}/community/{$community->getKey()}'>{$community->getName()}</a></span></li>".$header;
5555
}
5656
elseif(strpos($parent->getName(), 'user')!==false&&$this->Folder->getUser($parent)!==false)
5757
{
5858
$user=$this->Folder->getUser($parent);
59-
$header=" <li class='pathUser'><img alt='' src='{$this->view->webroot}/public/images/icons/unknownUser-small.png' /><span><a href='{$this->view->webroot}/user/{$user->getKey()}'>{$user->getFullName()}</a></span></li>".$header;
59+
$header=" <li class='pathUser'><img alt='' src='{$this->view->coreWebroot}/public/images/icons/unknownUser-small.png' /><span><a href='{$this->view->webroot}/user/{$user->getKey()}'>{$user->getFullName()}</a></span></li>".$header;
6060

6161
}
6262
else
6363
{
64-
$header=" <li class='pathFolder'><img alt='' src='{$this->view->webroot}/public/images/FileTree/directory.png' /><span><a href='{$this->view->webroot}/folder/{$parent->getKey()}'>{$parent->getName()}</a></span></li>".$header;
64+
$header=" <li class='pathFolder'><img alt='' src='{$this->view->coreWebroot}/public/images/FileTree/directory.png' /><span><a href='{$this->view->webroot}/folder/{$parent->getKey()}'>{$parent->getName()}</a></span></li>".$header;
6565
}
6666
$parent=$parent->getParent();
6767
}

core/controllers/components/DateComponent.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,14 @@ static public function ago($timestamp,$only_time=false)
4747

4848
if($only_time)
4949
{
50-
return $difference.' '.$periodsFr[$j];
50+
if(Zend_Registry::get('configGlobal')->application->lang=='fr')
51+
{
52+
return $difference.' '.$periodsFr[$j];
53+
}
54+
else
55+
{
56+
return $difference.' '.$periods[$j];
57+
}
5158
}
5259
if(Zend_Registry::get('configGlobal')->application->lang=='fr')
5360
{

core/controllers/forms/AssetstoreForm.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function createAssetstoreForm()
3030
$assetstoretype = new Zend_Form_Element_Select('type',array('id' => 'assetstoretype'));
3131
$assetstoretype->setLabel('Select a type')->setMultiOptions($assetstoretypes);
3232
// Add a loading image
33-
$assetstoretype->setDescription('<div class="assetstoreLoading" style="display:none"><img src="'.$this->webroot.'/public/images/icons/loading.gif"/></div>')
33+
$assetstoretype->setDescription('<div class="assetstoreLoading" style="display:none"><img src="'.$this->coreWebroot.'/public/images/icons/loading.gif"/></div>')
3434
->setDecorators(array(
3535
'ViewHelper',
3636
array('Description', array('escape' => false, 'tag' => false)),

core/layouts/.htaccess

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
2+
Order Allow,Deny
3+
Deny from all

core/layouts/layout.phtml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,26 @@
66
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
77
<title><?= $this->title ?></title>
88
<!-- Import CSS -->
9-
<link rel="shortcut icon" href="<?php echo $this->webroot ?>/public/images/icons/favicon.ico" />
9+
<link rel="shortcut icon" href="<?php echo $this->coreWebroot ?>/public/images/icons/favicon.ico" />
1010
<?php
1111
if (Zend_Registry::get("configGlobal")->smartoptimizer == 1)
1212
{
13-
echo '<link type="text/css" rel="stylesheet" href="' . $this->webroot . '/public/css/layout/main.css,view.css,jquery-ui.css,form.css,loginForm.css,jquery.treeTable.css,jquery.cluetip.css" />';
13+
echo '<link type="text/css" rel="stylesheet" href="' . $this->coreWebroot . '/public/css/layout/main.css,view.css,jquery-ui.css,form.css,loginForm.css,jquery.treeTable.css,jquery.cluetip.css" />';
1414
}
1515
else
1616
{
17-
echo '<link type="text/css" rel="stylesheet" href="' . $this->webroot . '/public/css/layout/main.css" />';
18-
echo '<link type="text/css" rel="stylesheet" href="' . $this->webroot . '/public/css/layout/jquery.cluetip.css" />';
19-
echo '<link type="text/css" rel="stylesheet" href="' . $this->webroot . '/public/css/layout/view.css" />';
20-
echo '<link type="text/css" rel="stylesheet" href="' . $this->webroot . '/public/css/layout/jquery-ui.css" />';
21-
echo '<link type="text/css" rel="stylesheet" href="' . $this->webroot . '/public/css/layout/form.css" />';
22-
echo '<link type="text/css" rel="stylesheet" href="' . $this->webroot . '/public/css/layout/loginForm.css" />';
23-
echo '<link type="text/css" rel="stylesheet" href="' . $this->webroot . '/public/css/layout/jquery.treeTable.css" />';
17+
echo '<link type="text/css" rel="stylesheet" href="' . $this->coreWebroot . '/public/css/layout/main.css" />';
18+
echo '<link type="text/css" rel="stylesheet" href="' . $this->coreWebroot . '/public/css/layout/jquery.cluetip.css" />';
19+
echo '<link type="text/css" rel="stylesheet" href="' . $this->coreWebroot . '/public/css/layout/view.css" />';
20+
echo '<link type="text/css" rel="stylesheet" href="' . $this->coreWebroot . '/public/css/layout/jquery-ui.css" />';
21+
echo '<link type="text/css" rel="stylesheet" href="' . $this->coreWebroot . '/public/css/layout/form.css" />';
22+
echo '<link type="text/css" rel="stylesheet" href="' . $this->coreWebroot . '/public/css/layout/loginForm.css" />';
23+
echo '<link type="text/css" rel="stylesheet" href="' . $this->coreWebroot . '/public/css/layout/jquery.treeTable.css" />';
2424
}
2525
?>
2626
<!--[if IE]>
27-
<?php echo '<link type="text/css" rel="stylesheet" href="' . $this->webroot . '/public/css/layout/mainIE.css" />';?>
28-
<?php echo '<script type="text/javascript" src="' . $this->webroot . '/public/js/layout/roundCornerIE.js"></script>';?>
27+
<?php echo '<link type="text/css" rel="stylesheet" href="' . $this->coreWebroot . '/public/css/layout/mainIE.css" />';?>
28+
<?php echo '<script type="text/javascript" src="' . $this->coreWebroot . '/public/js/layout/roundCornerIE.js"></script>';?>
2929
<![endif]-->
3030
<?php echo $this->headLink(); // import the css ?>
3131
<?php echo $this->headStyle(); // import the css ?>
@@ -36,18 +36,18 @@
3636
<div class="MainDialogContent">
3737
</div>
3838
<div class="MainDialogLoading">
39-
<img alt="" src="<?php echo $this->webroot?>/public/images/icons/loading.gif" />
39+
<img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/loading.gif" />
4040
</div>
4141
<input type="hidden" class="DialogContentPage"/>
4242
</div>
4343
<div class="TopDynamicBar">
4444
<div class="TopDynamicClose">
45-
<a class="closeButton" href="#" ><span><?php echo $this->t('Close');?></span><img alt="" src="<?php echo $this->webroot?>/public/images/icons/close.png"/> </a>
45+
<a class="closeButton" href="#" ><span><?php echo $this->t('Close');?></span><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/close.png"/> </a>
4646
</div>
4747
<div class="TopDynamicContent">
4848
</div>
4949
<div class="TopDynamicLoading">
50-
<img alt="" src="<?php echo $this->webroot?>/public/images/icons/loading.gif" />
50+
<img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/loading.gif" />
5151
</div>
5252
<input type="hidden" class="DynamicContentPage"/>
5353
</div>
@@ -70,7 +70,7 @@
7070
if($this->logged)
7171
{
7272
echo '
73-
<b><a id="topUserName" href="'.$this->webroot.'/user/'.$this->userDao->getUserId().'" >'.$this->userDao->getFullName().' <img class="arrowUser" src="'.$this->webroot.'/public/images/icons/arrow-user.gif" alt ="" /> </a> </b>
73+
<b><a id="topUserName" href="'.$this->webroot.'/user/'.$this->userDao->getUserId().'" >'.$this->userDao->getFullName().' <img class="arrowUser" src="'.$this->coreWebroot.'/public/images/icons/arrow-user.gif" alt ="" /> </a> </b>
7474
<ul>
7575
<li onclick="location.replace(\''.$this->webroot.'/user/userpage\');"><a>'.$this->t('My Page').'</a></li>
7676
<li class="myAccountLink"><a>'.$this->t('My Account').'</a></li>
@@ -108,11 +108,11 @@
108108
<li>
109109
<?php if($this->lang=='fr')
110110
{
111-
echo '<a href="'.$this->webroot.'?lang=en"><img src="'.$this->webroot.'/public/images/icons/english.png" alt="English"/>';
111+
echo '<a href="'.$this->webroot.'?lang=en"><img src="'.$this->coreWebroot.'/public/images/icons/english.png" alt="English"/>';
112112
}
113113
else
114114
{
115-
echo '<a href="'.$this->webroot.'?lang=fr"><img src="'.$this->webroot.'/public/images/icons/french.png" alt="French"/>';
115+
echo '<a href="'.$this->webroot.'?lang=fr"><img src="'.$this->coreWebroot.'/public/images/icons/french.png" alt="French"/>';
116116
}
117117
?>
118118
</a>
@@ -134,7 +134,7 @@
134134
<div class="HeaderAction">
135135
<ul>
136136
<li class="uploadFile" title="Upload" rel="<?php echo $this->webroot?>/upload/simpleupload">
137-
<a href="#"><img src="<?= $this->webroot ?>/public/images/icons/addfile.png" alt="Upload a file"/>
137+
<a href="#"><img src="<?= $this->coreWebroot ?>/public/images/icons/addfile.png" alt="Upload a file"/>
138138
Upload
139139
</a>
140140
</li>
@@ -148,11 +148,11 @@
148148
<div class="MainContent">
149149
<div class="SideBar">
150150
<ul>
151-
<li <?php if($this->activemenu=='feed') {echo 'class="active"';} ?> onclick="location.replace('<?php echo $this->webroot?>/feed');" ><a href="<?php echo $this->webroot?>/feed"><img alt="" src="<?php echo $this->webroot?>/public/images/icons/feed.png" /><span> <?php echo $this->t('Feed');?></span></a></li>
152-
<li <?php if($this->activemenu=='browse') {echo 'class="active"';} ?> onclick="location.replace('<?php echo $this->webroot?>/browse');" ><a href="<?php echo $this->webroot?>/browse"><img alt="" src="<?php echo $this->webroot?>/public/images/icons/data.png" /><span> <?php echo $this->t('Data');?></span></a></li>
153-
<li <?php if($this->activemenu=='community') {echo 'class="active"';} ?> onclick="location.replace('<?php echo $this->webroot?>/community');" ><a href="<?php echo $this->webroot?>/community"><img alt="" src="<?php echo $this->webroot?>/public/images/icons/community.png" /><span> <?php echo $this->t('Communities');?></span></a></li>
154-
<li id="menuUserInfo" <?php if($this->activemenu=='user') {echo 'class="active"';} ?> ><a href="javascript:;"><img alt="" src="<?php echo $this->webroot?>/public/images/icons/upload.png" /><span> <?php echo $this->t('My Uploads');?></span></a></li>
155-
<li <?php if($this->activemenu=='plugin') {echo 'class="active"';} ?> class="last"><a href="#"><img alt="" src="<?php echo $this->webroot?>/public/images/icons/plugin.png" /><span> <?php echo $this->t('Plugins');?></span></a></li>
151+
<li <?php if($this->activemenu=='feed') {echo 'class="active"';} ?> onclick="location.replace('<?php echo $this->webroot?>/feed');" ><a href="<?php echo $this->webroot?>/feed"><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/feed.png" /><span> <?php echo $this->t('Feed');?></span></a></li>
152+
<li <?php if($this->activemenu=='browse') {echo 'class="active"';} ?> onclick="location.replace('<?php echo $this->webroot?>/browse');" ><a href="<?php echo $this->webroot?>/browse"><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/data.png" /><span> <?php echo $this->t('Data');?></span></a></li>
153+
<li <?php if($this->activemenu=='community') {echo 'class="active"';} ?> onclick="location.replace('<?php echo $this->webroot?>/community');" ><a href="<?php echo $this->webroot?>/community"><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/community.png" /><span> <?php echo $this->t('Communities');?></span></a></li>
154+
<li id="menuUserInfo" <?php if($this->activemenu=='user') {echo 'class="active"';} ?> ><a href="javascript:;"><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/upload.png" /><span> <?php echo $this->t('My Uploads');?></span></a></li>
155+
<li <?php if($this->activemenu=='plugin') {echo 'class="active"';} ?> class="last"><a href="#"><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/plugin.png" /><span> <?php echo $this->t('Plugins');?></span></a></li>
156156
</ul>
157157
<hr/>
158158
<?php
@@ -197,15 +197,15 @@
197197
<?php
198198
if (Zend_Registry::get("configGlobal")->smartoptimizer == 1)
199199
{
200-
echo '<script type="text/javascript" src="' . $this->webroot . '/public/js/layout/jquery.js,jquery-ui.js,main.js,jquery.treeTable.js,jquery.cluetip.js"></script>';
200+
echo '<script type="text/javascript" src="' . $this->coreWebroot . '/public/js/layout/jquery.js,jquery-ui.js,main.js,jquery.treeTable.js,jquery.cluetip.js"></script>';
201201
}
202202
else
203203
{
204-
echo '<script type="text/javascript" src="' . $this->webroot . '/public/js/layout/jquery.js"></script>';
205-
echo '<script type="text/javascript" src="' . $this->webroot . '/public/js/layout/jquery.cluetip.js"></script>';
206-
echo '<script type="text/javascript" src="' . $this->webroot . '/public/js/layout/jquery-ui.js"></script>';
207-
echo '<script type="text/javascript" src="' . $this->webroot . '/public/js/layout/main.js"></script>';
208-
echo '<script type="text/javascript" src="' . $this->webroot . '/public/js/layout/jquery.treeTable.js"></script>';
204+
echo '<script type="text/javascript" src="' . $this->coreWebroot . '/public/js/layout/jquery.js"></script>';
205+
echo '<script type="text/javascript" src="' . $this->coreWebroot . '/public/js/layout/jquery.cluetip.js"></script>';
206+
echo '<script type="text/javascript" src="' . $this->coreWebroot . '/public/js/layout/jquery-ui.js"></script>';
207+
echo '<script type="text/javascript" src="' . $this->coreWebroot . '/public/js/layout/main.js"></script>';
208+
echo '<script type="text/javascript" src="' . $this->coreWebroot . '/public/js/layout/jquery.treeTable.js"></script>';
209209
}
210210
?>
211211
<?php echo $this->headScript() ?>

core/models/.htaccess

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
2+
Order Allow,Deny
3+
Deny from all

0 commit comments

Comments
 (0)