mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-20 13:21:54 +02:00
Code Issues Releases Wiki Activity

Use Library Manager to handle core libraries.

Browse Source
This commit is contained in:
lonalore
2017-01-26 12:45:45 +01:00
parent 7ef1d13b35
commit 7c0c0cd2f1
160 changed files with 22190 additions and 3024 deletions
Download Patch File Download Diff File Expand all files Collapse all files

188
e107_admin/prefs.php
View File

@@ -189,13 +189,16 @@ if(isset($_POST['updateprefs']))
}
$core_pref->update($key, $newValue);
/*if($newValue != $core_pref->get($key))
{ // Changed value
$core_pref->set($key, $newValue);
$prefChanges[$key] = $newValue;
}*/
}
if($core_pref->dataHasChanged())
{
// Need to clear cache in order to refresh library information.
e107::getCache()->clearAll('system');
}
$core_pref->save(false);
// special case, do session cleanup, logout, redirect to login screen
if($sessionRegenerate)
{
@@ -1671,67 +1674,51 @@ $text .= "
$text .= "
</fieldset>";
// Javascript Control
$text .= "
</fieldset>";
if(E107_DEBUG_LEVEL > 0)
{
// TODO - remove these old JS settings completely!
// Javascript Control
$text .= "
<fieldset class='e-hideme' id='core-prefs-javascript'>
<legend>".PRFLAN_242."</legend>
<legend>" . PRFLAN_242 . "</legend>
<table class='table adminform'>
<colgroup>
<col class='col-label' />
<col class='col-control' />
</colgroup>
<tbody>";
$js_options = array(
'auto' => PRFLAN_243, // load based on dependency
'admin' => PRFLAN_244, // Always load in admin
'front' => PRFLAN_245, // Always load in front-end
'all' => PRFLAN_246, // Always load in admin and front-end
'none' => PRFLAN_247 // disabled
);
//TODO FIXME
// ie. e107 Core Minimum: JS similar to e107 v1.0 should be loaded "e_js.php" (no framwork dependency)
// with basic functions like SyncWithServerTime() and expandit(), externalLinks() etc.
$js_types = array(
array('id' => 'jquery', 'name'=> 'jQuery (local)'),
array('id' => 'prototype', 'name'=> 'Prototype (local)'),
);
//TODO // separate switch for CDN.. or automatic fall-back.
foreach($js_types as $arr)
{
// $k = $arr['path'];
$k = $arr['id'];
$name = $arr['name'];
$text .= "<tr>
<td>".$name."</td>
<td>".$frm->radio("e_jslib_core[{$k}]", $js_options, $pref['e_jslib_core'][$k])."</td>
</tr>";
}
$text .= "
</tbody>
</table>";
$js_options = array(
'auto' => PRFLAN_243, // load based on dependency
'admin' => PRFLAN_244, // Always load in admin
'front' => PRFLAN_245, // Always load in front-end
'all' => PRFLAN_246, // Always load in admin and front-end
'none' => PRFLAN_247 // disabled
);
if(E107_DEBUG_LEVEL > 0)
$js_types = array(
array('id' => 'jquery', 'name' => 'jQuery (local)'),
array('id' => 'prototype', 'name' => 'Prototype (local)'),
);
foreach($js_types as $arr)
{
// $k = $arr['path'];
$k = $arr['id'];
$name = $arr['name'];
$text .= "<tr>
<td>" . $name . "</td>
<td>" . $frm->radio("e_jslib_core[{$k}]", $js_options, $pref['e_jslib_core'][$k]) . "</td>
</tr>";
}
$text .= "
$text .= "
</tbody>
</table>
<table class='table adminform' style='margin-top: 20px'>
<colgroup>
<col class='col-label' />
@@ -1742,49 +1729,53 @@ $text .= "
</thead>
<tbody>
<tr>
<td>".PRFLAN_248."</td>
<td>" . PRFLAN_248 . "</td>
<td>
".$frm->radio_switch('e_jslib_nocombine', $pref['e_jslib_nocombine'], LAN_YES, LAN_NO)."
<div class='smalltext field-help'>".PRFLAN_249."</div>
" . $frm->radio_switch('e_jslib_nocombine', $pref['e_jslib_nocombine'], LAN_YES, LAN_NO) . "
<div class='smalltext field-help'>" . PRFLAN_249 . "</div>
</td>
</tr>
<tr>
<td>".PRFLAN_250."</td>
<td>" . PRFLAN_250 . "</td>
<td>
".$frm->radio_switch('e_jslib_gzip', $pref['e_jslib_gzip'], LAN_YES, LAN_NO)."
<div class='smalltext field-help'>".PRFLAN_251."</div>
" . $frm->radio_switch('e_jslib_gzip', $pref['e_jslib_gzip'], LAN_YES, LAN_NO) . "
<div class='smalltext field-help'>" . PRFLAN_251 . "</div>
</td>
</tr>
<tr>
<td>".PRFLAN_252."</td>
<td>" . PRFLAN_252 . "</td>
<td>
".$frm->radio_switch('e_jslib_nocache', $pref['e_jslib_nocache'], LAN_YES, LAN_NO)."
<div class='smalltext field-help'>".PRFLAN_251."</div>
" . $frm->radio_switch('e_jslib_nocache', $pref['e_jslib_nocache'], LAN_YES, LAN_NO) . "
<div class='smalltext field-help'>" . PRFLAN_251 . "</div>
</td>
</tr>
<tr>
<td>".PRFLAN_253."</td>
<td>" . PRFLAN_253 . "</td>
<td>
".$frm->radio_switch('e_jslib_nobcache', $pref['e_jslib_nobcache'], LAN_YES, LAN_NO)."
<div class='smalltext field-help'>".PRFLAN_251."</div>
" . $frm->radio_switch('e_jslib_nobcache', $pref['e_jslib_nobcache'], LAN_YES, LAN_NO) . "
<div class='smalltext field-help'>" . PRFLAN_251 . "</div>
</td>
</tr>
";
$text .= "
</tbody></table>";
";
}
else
{
$text .= "<div>".
$frm->hidden('e_jslib_nocombine',1).
$frm->hidden('e_jslib_nocache', 1).
$frm->hidden('e_jslib_nobcache',1).
$frm->hidden('e_jslib_gzip',0).
"</div>";
$text .= "</tbody></table></fieldset>";
}
else
{
$text .= "<div>";
$text .= $frm->hidden('e_jslib_core[jquery]', 'all');
$text .= $frm->hidden('e_jslib_core[prototype]', 'none');
$text .= $frm->hidden('e_jslib_nocombine', 1);
$text .= $frm->hidden('e_jslib_nocache', 1);
$text .= $frm->hidden('e_jslib_nobcache', 1);
$text .= $frm->hidden('e_jslib_gzip', 0);
$text .= "</div>";
}
}
/**
* @addtogroup CDN settings
* @{
*/
// [e_LANGUAGEDIR]/[e_LANGUAGE]/lan_library_manager.php
e107::lan('core', 'library_manager');
@@ -1795,6 +1786,7 @@ $CDNproviders = array(
);
$text .= '
<fieldset class="e-hideme" id="core-prefs-javascript">
<h4 class="caption">' . LAN_LIBRARY_MANAGER_30 . '</h4>
<table class="table adminform">
<colgroup>
@@ -1821,6 +1813,16 @@ $text .= '
// Submit button.
$text .= pref_submit('javascript');
/**
* @} End of "addtogroup CDN settings".
*/
/**
* @addtogroup Third-party libraries
* @{
*/
$text .= '<h4 class="caption">' . LAN_LIBRARY_MANAGER_25 . '</h4>';
$text .= '<table width="100%" class="table table-striped" cellpadding="0" cellspacing="0">';
$text .= '<thead>';
@@ -1871,11 +1873,18 @@ if(empty($libraries))
$text .= '</tbody>';
$text .= '</table>';
$text .= "</fieldset>";
/**
* @} End of "addtogroup Third-party libraries".
*/
/**
* @addtogroup Advanced Features
* @{
*/
//Advanced Features
$text .= "
<fieldset class='e-hideme' id='core-prefs-advanced'>
<legend>".PRFLAN_149."</legend>
@@ -1942,7 +1951,9 @@ $text .= "
</fieldset>
";
// END Advanced Features
/**
* @} End of "addtogroup Advanced Features".
*/
$text .= "
@@ -2004,6 +2015,11 @@ function prefs_adminmenu()
e107::getNav()->admin("Basic ".LAN_OPTIONS.'--id--prev_nav', 'core-prefs-main', $var);
}
/**
* @addtogroup Third-party libraries
* @{
*/
/**
* Helper function to get library's name.
*/
@@ -2110,3 +2126,7 @@ function libraryGetStatus($details)
$text = $details['error'];
return '<span class="text-danger" data-toggle="tooltip" data-placement="top" title="' . $text . '">' . $icon . '</span>';
}
/**
* @} End of "addtogroup Third-party libraries".
*/