mirror of
https://github.com/e107inc/e107.git
synced 2025-04-20 04:32:01 +02:00
Path updates
This commit is contained in:
parent
91af5678cb
commit
5f143146a0
@ -199,7 +199,7 @@ function headerjs()
|
||||
//add required core lan - delete confirm message
|
||||
('".LAN_JSCONFIRM."').addModLan('core', 'delete_confirm');
|
||||
</script>
|
||||
<script type='text/javascript' src='".e_FILE_ABS."jslib/core/admin.js'></script>
|
||||
<script type='text/javascript' src='".e_JS."core/admin.js'></script>
|
||||
";
|
||||
|
||||
return $ret;
|
||||
|
@ -1126,7 +1126,7 @@ function headerjs()
|
||||
'AdminMenu': false
|
||||
}
|
||||
</script>
|
||||
<script type='text/javascript' src='".e_FILE_ABS."jslib/core/admin.js'></script>
|
||||
<script type='text/javascript' src='".e_JS."core/admin.js'></script>
|
||||
";
|
||||
|
||||
return $ret;
|
||||
|
@ -664,7 +664,7 @@ function headerjs()
|
||||
<script type='text/javascript'>
|
||||
//add required core lan - delete confirm message
|
||||
</script>
|
||||
<script type='text/javascript' src='".e_FILE_ABS."jslib/core/admin.js'></script>
|
||||
<script type='text/javascript' src='".e_JS."core/admin.js'></script>
|
||||
";
|
||||
|
||||
return $ret;
|
||||
|
@ -241,7 +241,7 @@ function headerjs()
|
||||
'AdminMenu': false
|
||||
}
|
||||
</script>
|
||||
<script type='text/javascript' src='".e_FILE_ABS."jslib/core/admin.js'></script>
|
||||
<script type='text/javascript' src='".e_JS."core/admin.js'></script>
|
||||
";
|
||||
|
||||
return $ret;
|
||||
|
@ -604,7 +604,7 @@ function headerjs()
|
||||
//add required core lan - delete confirm message
|
||||
(".e_jshelper::toString(FRTLAN_54).").addModLan('core', 'delete_confirm');
|
||||
</script>
|
||||
<script type='text/javascript' src='".e_FILE_ABS."jslib/core/admin.js'></script>
|
||||
<script type='text/javascript' src='".e_JS."core/admin.js'></script>
|
||||
";
|
||||
|
||||
return $ret;
|
||||
|
@ -567,7 +567,7 @@ class media_admin_ui extends e_admin_ui
|
||||
|
||||
function uploadPage()
|
||||
{
|
||||
$text = '<div id="uploader" rel="'.e_FILE.'jslib/plupload/upload.php">
|
||||
$text = '<div id="uploader" rel="'.e_JS.'plupload/upload.php">
|
||||
<p>No HTML5 support.</p>
|
||||
</div>';
|
||||
|
||||
|
@ -1057,7 +1057,7 @@ function headerjs()
|
||||
return;
|
||||
require_once (e_HANDLER.'js_helper.php');
|
||||
$ret = "
|
||||
<script type='text/javascript' src='".e_FILE_ABS."jslib/core/admin.js'></script>
|
||||
<script type='text/javascript' src='".e_JS."core/admin.js'></script>
|
||||
<script type='text/javascript'>
|
||||
//add required core lan - delete confirm message
|
||||
(".e_jshelper::toString(LAN_JSCONFIRM).").addModLan('core', 'delete_confirm');
|
||||
|
@ -152,7 +152,7 @@ function headerjs()
|
||||
'AdminMenu': false
|
||||
}
|
||||
</script>
|
||||
<script type='text/javascript' src='".e_FILE_ABS."jslib/core/admin.js'></script>
|
||||
<script type='text/javascript' src='".e_JS."core/admin.js'></script>
|
||||
";
|
||||
|
||||
return $ret;
|
||||
|
@ -158,7 +158,7 @@ function headerjs()
|
||||
}
|
||||
|
||||
</script>
|
||||
<script type='text/javascript' src='".e_FILE_ABS."jslib/core/admin.js'></script>
|
||||
<script type='text/javascript' src='".e_JS."core/admin.js'></script>
|
||||
";
|
||||
|
||||
return $ret;
|
||||
|
@ -391,11 +391,11 @@ class e_jsmanager
|
||||
{
|
||||
foreach ($file_path as $fpath => $z)
|
||||
{
|
||||
$this->tryHeaderFile('{e_FILE}jslib/'.trim($fpath, '/'), $z);
|
||||
$this->tryHeaderFile('{e_WEB_JS}'.trim($fpath, '/'), $z);
|
||||
}
|
||||
return $this;
|
||||
}
|
||||
$this->tryHeaderFile('{e_FILE}jslib/'.trim($file_path, '/'), $zone);
|
||||
$this->tryHeaderFile('{e_WEB_JS}'.trim($file_path, '/'), $zone);
|
||||
return $this;
|
||||
}
|
||||
|
||||
@ -444,7 +444,7 @@ class e_jsmanager
|
||||
*/
|
||||
public function headerCore($file_path, $zone = 2)
|
||||
{
|
||||
$this->headerFile('{e_FILE}jslib/'.trim($file_path, '/'), $zone);
|
||||
$this->headerFile('{e_WEB_JS}'.trim($file_path, '/'), $zone);
|
||||
return $this;
|
||||
}
|
||||
|
||||
@ -693,7 +693,7 @@ class e_jsmanager
|
||||
switch($type)
|
||||
{
|
||||
case 'core':
|
||||
$file_path = '{e_FILE}jslib/'.trim($file_path, '/');
|
||||
$file_path = '{e_WEB_JS}'.trim($file_path, '/');
|
||||
$registry = &$this->_e_jslib_core;
|
||||
break;
|
||||
|
||||
@ -709,7 +709,7 @@ class e_jsmanager
|
||||
break;
|
||||
|
||||
case 'core_css': //FIXME - core CSS should point to new e_WEB/css; add one more case - js_css -> e_WEB/jslib/
|
||||
$file_path = $runtime_location.'|{e_FILE}jslib/'.trim($file_path, '/')."|{$pre}|{$post}";
|
||||
$file_path = $runtime_location.'|{e_WEB_JS}'.trim($file_path, '/')."|{$pre}|{$post}";
|
||||
if(!isset($this->_e_css['core'])) $this->_e_css['core'] = array();
|
||||
$registry = &$this->_e_css['core'];
|
||||
$runtime = true;
|
||||
|
@ -431,7 +431,7 @@ class e_install
|
||||
</tr>
|
||||
<tr>
|
||||
<td class='row-border'><label for='prefix'>".LANINS_029."</label></td>
|
||||
<td class='row-border'><input type='text' name='prefix' size='20' id='prefix' value='e107_' maxlength='100' /></td>
|
||||
<td class='row-border'><input type='text' name='prefix' size='20' id='prefix' value='e107_' maxlength='100' required='required' /></td>
|
||||
<td class='row-border'>".LANINS_034."</td>
|
||||
</tr>
|
||||
</table>
|
||||
@ -1411,9 +1411,9 @@ class e_install
|
||||
function check_writable_perms($list = 'must_write')
|
||||
{
|
||||
$bad_files = array();
|
||||
// old entry, not used at this time, could come back - |{$SYSTEM_DIRECTORY}cache/url/
|
||||
$data['must_write'] = 'e107_config.php|{$MEDIA_DIRECTORY}|{$MEDIA_DIRECTORY}images/|{$SYSTEM_DIRECTORY}|{$SYSTEM_DIRECTORY}logs/|{$SYSTEM_DIRECTORY}cache/|{$SYSTEM_DIRECTORY}cache/content/|{$SYSTEM_DIRECTORY}cache/db/|{$SYSTEM_DIRECTORY}cache/images/|{$SYSTEM_DIRECTORY}url/';
|
||||
$data['can_write'] = '{$CACHE_DIRECTORY}|{$UPLOADS_DIRECTORY}|{$PLUGINS_DIRECTORY}|{$THEMES_DIRECTORY}';
|
||||
|
||||
$data['must_write'] = 'e107_config.php|{$MEDIA_DIRECTORY}|{$SYSTEM_DIRECTORY}'; // all-sub folders are created on-the-fly
|
||||
$data['can_write'] = '{$PLUGINS_DIRECTORY}|{$THEMES_DIRECTORY}';
|
||||
if (!isset($data[$list])) return $bad_files;
|
||||
foreach ($this->e107->e107_dirs as $dir_name => $value)
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user