New 'libraries' folder in root instalation directory

This commit is contained in:
Manuel Cillero 2017-08-08 18:24:12 +02:00
parent 05b6a91b0c
commit 006992b900
2267 changed files with 50 additions and 65 deletions

View file

@ -1203,7 +1203,7 @@ function ckeditor_path($local = FALSE, $refresh = FALSE) {
if ($refresh || (!$cke_path)) {
$mod_path = drupal_get_path('module', 'ckeditor');
$lib_path = 'sites/all/libraries';
$lib_path = 'libraries';
$global_profile = ckeditor_profile_load('CKEditor Global Profile', $refresh);
//default: path to ckeditor subdirectory in the ckeditor module directory (starting from the document root)
@ -1236,7 +1236,7 @@ function ckeditor_path($local = FALSE, $refresh = FALSE) {
$gs['ckeditor_local_path'] = strtr($gs['ckeditor_path'], array("%b" => "."));
}
if (FALSE !== strpos($gs['ckeditor_path'], "%l")) {
$gs['ckeditor_local_path'] = strtr($gs['ckeditor_path'], array("%l" => "sites/all/libraries"));
$gs['ckeditor_local_path'] = strtr($gs['ckeditor_path'], array("%l" => "libraries"));
}
}
}
@ -1275,7 +1275,7 @@ function ckeditor_plugins_path($local = FALSE, $refresh = FALSE) {
if ($refresh || (!$cke_plugins_path)) {
$mod_path = drupal_get_path('module', 'ckeditor');
$lib_path = 'sites/all/libraries';
$lib_path = 'libraries';
$global_profile = ckeditor_profile_load('CKEditor Global Profile', $refresh);
//default: path to plugins subdirectory in the ckeditor module directory (starting from the document root)
@ -1309,7 +1309,7 @@ function ckeditor_plugins_path($local = FALSE, $refresh = FALSE) {
$gs['ckeditor_plugins_local_path'] = strtr($gs['ckeditor_plugins_path'], array("%b" => "."));
}
if (FALSE !== strpos($gs['ckeditor_plugins_path'], "%l")) {
$gs['ckeditor_plugins_local_path'] = strtr($gs['ckeditor_plugins_path'], array("%l" => "sites/all/libraries"));
$gs['ckeditor_plugins_local_path'] = strtr($gs['ckeditor_plugins_path'], array("%l" => "libraries"));
}
}
}
@ -1348,7 +1348,7 @@ function ckfinder_path($refresh = FALSE) {
if ($refresh || (!$ckf_path)) {
$mod_path = drupal_get_path('module', 'ckeditor');
$lib_path = 'sites/all/libraries';
$lib_path = 'libraries';
$global_profile = ckeditor_profile_load('CKEditor Global Profile', $refresh);
//default: path to ckeditor subdirectory in the ckeditor module directory (starting from the document root)
@ -1484,4 +1484,3 @@ function ckeditor_get_settings() {
echo json_encode($_SESSION['cke_get_settings'][$_POST['id']]);
die();
}

View file

@ -45,7 +45,7 @@ function ckeditor_admin_main() {
'Checking for !filename or !file.',
array(
'!filename' => '<code>' . $ckconfig_file . '</code>',
'!file' => '<code>sites/all/libraries/ckeditor/ckeditor.js</code>'
'!file' => '<code>libraries/ckeditor/ckeditor.js</code>'
)
));
drupal_set_message(t(
@ -56,8 +56,8 @@ function ckeditor_admin_main() {
'!ckeditorpath' => '<code>' . $editor_path . '</code>',
'!ckeditorsubdir' => '<code>' . $editor_path . '/editor</code>',
'!ckeditorfile' => '<code>' . $editor_path . '/ckeditor.js</code>',
'!ckeditorlibrary' => '<code>sites/all/libraries/ckeditor/ckeditor.js</code>',
'!librarypath' => '<code>sites/all/libraries/ckeditor</code>'
'!ckeditorlibrary' => '<code>libraries/ckeditor/ckeditor.js</code>',
'!librarypath' => '<code>libraries/ckeditor</code>'
)
), 'error');
drupal_set_message(t(
@ -1614,7 +1614,7 @@ function ckeditor_admin_global_profile_form($form_state, $mode = 'add') {
'!path' => '<code>' . ckeditor_path(FALSE) . '</code>',
'!base' => '<code>' . base_path() . '</code>',
'!files' => '<code>' . base_path() . $module_drupal_path . '</code>',
'!library' => '<code>' . base_path() . 'sites/all/libraries/</code>'
'!library' => '<code>' . base_path() . 'libraries/</code>'
)
),
'#required' => TRUE
@ -1656,7 +1656,7 @@ function ckeditor_admin_global_profile_form($form_state, $mode = 'add') {
'!l' => '<br /><code>%l</code>',
'!base' => '<code>' . base_path() . '</code>',
'!files' => '<code>' . base_path() . $module_drupal_path . '</code>' ,
'!library' => '<code>' . base_path() . 'sites/all/libraries/</code>'
'!library' => '<code>' . base_path() . 'libraries/</code>'
)
) .
'<br />' .
@ -1708,7 +1708,7 @@ function ckeditor_admin_global_profile_form($form_state, $mode = 'add') {
'!l' => '<br /><code>%l</code>',
'!base' => '<code>' . base_path() . '</code>',
'!files' => '<code>' . base_path() . $module_drupal_path . '</code>',
'!library' => '<code>' . base_path() . 'sites/all/libraries/</code>'
'!library' => '<code>' . base_path() . 'libraries/</code>'
)
) .
'<br />' .
@ -2322,4 +2322,4 @@ CKEDITOR.replace('editor', {
$html .= "</body>";
$html .= "</html>";
echo $html;
}
}

View file

@ -46,7 +46,7 @@ function ckeditor_drush_command() {
'callback' => 'ckeditor_drush_download',
'description' => dt('Downloads the required CKEditor library from svn.ckeditor.com.'),
'arguments' => array(
'path' => dt('Optional. The path to the download folder. If omitted, Drush will use the default location (<code>sites/all/libraries/ckeditor</code>).'),
'path' => dt('Optional. The path to the download folder. If omitted, Drush will use the default location (<code>libraries/ckeditor</code>).'),
),
);
return $items;
@ -61,7 +61,7 @@ function ckeditor_drush_download() {
$path = $args[0];
}
else {
$path = drush_get_context('DRUSH_DRUPAL_ROOT') . '/sites/all/libraries/ckeditor';
$path = drush_get_context('DRUSH_DRUPAL_ROOT') . '/libraries/ckeditor';
}
if (drush_shell_exec('svn checkout http://svn.ckeditor.com/CKEditor/releases/stable/ ' . $path)) {

View file

@ -614,8 +614,8 @@ function _ckeditor_script_path() {
elseif (file_exists($module_path . '/ckeditor/ckeditor/ckeditor.js')) {
$jspath='%m/ckeditor/ckeditor';
}
elseif (file_exists('sites/all/libraries/ckeditor/ckeditor.js')) {
$jspath='%b/sites/all/libraries/ckeditor';
elseif (file_exists('libraries/ckeditor/ckeditor.js')) {
$jspath='%b/libraries/ckeditor';
}
return $jspath;
}

View file

@ -31,7 +31,7 @@ INSTALLATION
supported by the GeSHi filter module.
Place the entire extracted 'geshi' folder (which contains geshi.php)
in the geshifilter directory (e.g. as sites/all/modules/geshifilter/geshi),
or better, in a libraries directory (e.g. as sites/all/libraries/geshi).
or better, in a libraries directory (e.g. as libraries/geshi).
3. Enable this module as any other Drupal module by navigating to
administer > site building > modules

View file

@ -43,7 +43,7 @@ class GeshiFilterAdministrationTest extends DrupalWebTestCase {
// Make sure the GeSHi filter module is enabled.
parent::setUp('geshifilter');
// And set the path to the geshi library.
variable_set('geshifilter_geshi_dir','sites/all/libraries/geshi');
variable_set('geshifilter_geshi_dir','libraries/geshi');
// Create a filter admin user
$permissions = array('administer filters', 'administer site configuration');
@ -177,7 +177,7 @@ class GeshiFilterTest extends DrupalWebTestCase {
// Make sure that Geshi filter module is enabled.
parent::setUp('geshifilter');
// And set the path to the geshi library.
variable_set('geshifilter_geshi_dir','sites/all/libraries/geshi');
variable_set('geshifilter_geshi_dir','libraries/geshi');
// Create a filter admin user
$permissions = array(
@ -551,4 +551,3 @@ class GeshiFilterTest extends DrupalWebTestCase {
}
}

View file

@ -66,12 +66,12 @@ function htmlpurifier_requirements($phase) {
$library_path = libraries_get_path('htmlpurifier');
$using_libraries = true;
if (!file_exists("$library_path/htmlpurifier/HTMLPurifier.auto.php")) {
$library_path = 'sites/all/libraries';
$library_path = 'libraries';
$complain_loc = true;
$using_libraries = false;
}
} else {
$library_path = 'sites/all/libraries';
$library_path = 'libraries';
$using_libraries = false;
}

View file

@ -265,7 +265,7 @@ function _htmlpurifier_load() {
}
$done = true;
$module_path = drupal_get_path('module', 'htmlpurifier');
$library_path = 'sites/all/libraries';
$library_path = 'libraries';
if (function_exists('libraries_get_path')) {
$library_path = libraries_get_path('htmlpurifier');
// This may happen if the user has HTML Purifier installed under the
@ -273,7 +273,7 @@ function _htmlpurifier_load() {
// move it over. There is code for emitting errors in
// htmlpurifier.install when this is the case.
if (!file_exists("$library_path/htmlpurifier/HTMLPurifier.auto.php")) {
$library_path = 'sites/all/libraries';
$library_path = 'libraries';
}
}

View file

@ -31,19 +31,19 @@ To submit bug reports and feature suggestions, or to track changes:
* Put the downloaded archive into the directory:
/sites/all/libraries/jquery.ui-1.6.zip
/libraries/jquery.ui-1.6.zip
* Extract the archive. This will create the following sub-directory:
/sites/all/libraries/jquery.ui-1.6/
/libraries/jquery.ui-1.6/
* Rename the sub-directory into "jquery.ui":
/sites/all/libraries/jquery.ui/
/libraries/jquery.ui/
so the actual jQuery UI JavaScript files are located in:
/sites/all/libraries/jquery.ui/ui/*.js
/libraries/jquery.ui/ui/*.js
* Enable the module at Administer >> Site building >> Modules.
@ -64,19 +64,19 @@ to jQuery UI 1.7, you can get around this by doing the following:
* Put the downloaded archive into the directory:
/sites/all/libraries/jquery.ui-1.7.zip
/libraries/jquery.ui-1.7.zip
* Extract the archive. This will create the following sub-directory:
/sites/all/libraries/jquery.ui-1.7/
/libraries/jquery.ui-1.7/
* Rename the sub-directory into "jquery.ui":
/sites/all/libraries/jquery.ui/
/libraries/jquery.ui/
so the actual jQuery UI JavaScript files are located in:
/sites/all/libraries/jquery.ui/ui/*.js
/libraries/jquery.ui/ui/*.js
* Enable the module at Administer >> Site building >> Modules.
@ -115,4 +115,3 @@ Current maintainers:
* Angela Byron (webchick)
* Addison Berry (add1sun)
* Daniel F. Kudwien (sun) - http://drupal.org/user/54136

View file

@ -33,7 +33,7 @@ function jquery_ui_requirements($phase) {
$requirements['jquery_ui']['description'] = $t('The <a href="@jqueryui">jQuery UI</a> plugin is missing. <a href="@download">Download</a> and extract it into the <code>@directory</code> directory. Rename the extracted folder to <code>@library-folder</code>.', array(
'@jqueryui' => 'http://jqueryui.com',
'@download' => 'http://code.google.com/p/jquery-ui/downloads/list?q=1.6',
'@directory' => 'sites/all/libraries',
'@directory' => 'libraries',
'@library-folder' => 'jquery.ui',
));
$requirements['jquery_ui']['severity'] = REQUIREMENT_ERROR;
@ -48,4 +48,3 @@ function jquery_ui_requirements($phase) {
function jquery_ui_uninstall() {
variable_del('jquery_ui_compression_type');
}

View file

@ -91,9 +91,9 @@ function jquery_ui_get_path() {
$path = FALSE;
}
}
// Manually check sites/all/libraries in case Libraries API is not available.
elseif (file_exists('./sites/all/libraries/jquery.ui')) {
$path = 'sites/all/libraries/jquery.ui';
// Manually check libraries in case Libraries API is not available.
elseif (file_exists('./libraries/jquery.ui')) {
$path = 'libraries/jquery.ui';
}
// Check the module directory for backwards compatibility if other methods
@ -133,4 +133,3 @@ function jquery_ui_get_version() {
return $version;
}

View file

@ -22,7 +22,7 @@ August 13, 2010
Updated Hungarian translation.
August 12, 2010
Fix #880954: Enable translation of 'send page as' options
Fix #880400: document alternative sites/all/libraries path in INSTALL.txt
Fix #880400: document alternative libraries path in INSTALL.txt
August 11, 2010
SA-CONTRIB-2010-TBD: disable local file access with wkhtmltopdf
Update CHANGELOG
@ -115,7 +115,7 @@ October 7, 2009
Fix #578990: enable tokens in the wkhtmltopdf options string
October 3, 2009
Fix #582360: don't complain about missing e-mail addresses when there's a blank line at the end
Fix #582104: look for PDF libraries in sites/all/libraries
Fix #582104: look for PDF libraries in libraries folder
Fix #572848 by aether: Use theme_username() for print_mail_form defaults
Fix #566138: add setting to close the window when both the new window and send to printer are enabled
September 12, 2009

View file

@ -19,7 +19,7 @@ issue queue at Drupal.org.
supported paths:
* print module lib directory (usually sites/all/modules/print/lib)
* libraries directory (sites/all/libraries)
* libraries directory (libraries)
dompdf support:
The dompdf tool produces results that are more faithful to the HTML
@ -37,7 +37,7 @@ dompdf support:
5. If you're using dompdf-0.5.1, delete the dompdf.php file as it contains
a security vulnerability
6. If you're using dompdf-0.6 or later, you can try to enable the Unicode
support, but you'll need to add some Unicode fonts. See
support, but you'll need to add some Unicode fonts. See
http://groups.google.com/group/dompdf/browse_thread/thread/9f7bc0162b04d5cf
for further info on this.
7. Check http://code.google.com/p/dompdf/ for further information.
@ -64,7 +64,7 @@ wkhtmltopdf support:
which doesn't require you to compile anything. Note that the compiled
version may require a running X server (static uses patched libs that can
work without one).
2. Place the wkhtmltopdf executable into one of the supported paths.
2. Place the wkhtmltopdf executable into one of the supported paths.
(usually sites/all/modules/print/lib). You can also place a symbolic link
to the executable.
3. Check http://code.google.com/p/wkhtmltopdf/ for further information.
@ -94,4 +94,3 @@ Disallow: /*/print$
Note that pattern matching in robots.txt is a Google extension (see
http://www.google.com/support/webmasters/bin/answer.py?answer=40367 for more
information).

View file

@ -1,6 +1,5 @@
Instead of placing the downloaded external libs (such as TCPDF, dompdf,
etc.) used by the print module here, you should place them in
sites/all/libraries.
etc.) used by the print module here, you should place them in libraries.
This directory is still a valid location for them, however. The Libraries
API module library path is also valid.

View file

@ -34,7 +34,7 @@ function print_pdf_drush_command() {
'library' => dt('The PDF library to download. Either tcpdf, dompdf or wkhtmltopdf.'),
),
'options' => array(
'path' => dt('A path to the download folder. If omitted Drush will use the default location (@path).', array('@path' => 'sites/all/libraries')),
'path' => dt('A path to the download folder. If omitted Drush will use the default location (@path).', array('@path' => 'libraries')),
),
'aliases' => array('pdfdl'),
'bootstrap' => DRUSH_BOOTSTRAP_DRUPAL_ROOT, // No site or config needed.
@ -52,7 +52,7 @@ function drush_print_pdf_download($library) {
if ($download_url) {
$path = drush_get_option('path');
if (empty($path)) {
$path = drush_get_context('DRUSH_DRUPAL_ROOT') . '/sites/all/libraries';
$path = drush_get_context('DRUSH_DRUPAL_ROOT') . '/libraries';
}
// Create the path if it does not exist.

View file

@ -11,7 +11,7 @@ define('PRINTPDF_PATH', 'printpdf');
define('PRINT_PDF_FORMAT', 'pdf');
define('PRINT_PDF_LIB_PATH', 'sites/all/libraries');
define('PRINT_PDF_LIB_PATH', 'libraries');
define('PRINT_PDF_LINK_POS_DEFAULT', serialize(array('link' => 'link', 'block' => 'block', 'help' => 'help')));
define('PRINT_PDF_LINK_TEASER_DEFAULT', 0);

View file

@ -7,7 +7,7 @@ Version 6.x-2.2:
Version 6.x-2.1:
- Bug #1508998 by m.koo, juliangb | copeasetic: Fixed Views - Broken/Missing handler on Status field.
- Bug #1596208 by Raphael Dürst: Fixed Bug with datebegin/dateend and _stormproject_beforesave().
- Bug #1596208 by Raphael D<EFBFBD>rst: Fixed Bug with datebegin/dateend and _stormproject_beforesave().
- Bug #1621074 by Raphael Dürst: Fixed Calculation of hourly and daily rates.
- Bug #1505446 by juliangb | modctek: Fixed Fullname still being called on Invoice template.
- Bug #1448764 by kfritsche: Fixed Ticketlist doesn't show edit link.
@ -248,7 +248,7 @@ Version 6.x-1.23:
- Feature #325363: Ticket - more fields visible on node view
- Bug #469002: Teammember - assigned person not remembered after save
- Bug #450778: Invoice - allow editting of invoice amount fields
- Task #456164: Added variable for location of tcpdf library plus check of existance. Defaults now to sites/all/libraries.
- Task #456164: Added variable for location of tcpdf library plus check of existance. Defaults now to libraries.
- Bug #460472: Knowledgebase topics not displayed, plus similar bug for organization countries
- Bug #433300: Can't cancel attribute creation - removed code
- Feature #348777: Organization Phone Number

View file

@ -883,8 +883,8 @@ function storminvoice_admin_settings() {
$form['storminvoice_tcpdf_location'] = array(
'#type' => 'textfield',
'#title' => t('Location of tcpdf library'),
'#default_value' => variable_get('storminvoice_tcpdf_location', t('sites/all/libraries/tcpdf')),
'#description' => t('The directory that contains the <a href="http://sourceforge.net/projects/tcpdf/files/">TCPDF library</a> (sites/all/libraries/tcpdf is recommended).'),
'#default_value' => variable_get('storminvoice_tcpdf_location', t('libraries/tcpdf')),
'#description' => t('The directory that contains the <a href="http://sourceforge.net/projects/tcpdf/files/">TCPDF library</a> (libraries/tcpdf is recommended).'),
'#size' => 50,
);

View file

@ -199,7 +199,7 @@ function theme_storminvoice_view($node, $teaser = FALSE, $page = FALSE) {
);
// Display link to tcpdf library only if library is installed.
$tcpdf_dir = variable_get('storminvoice_tcpdf_location', 'sites/all/libraries/tcpdf');
$tcpdf_dir = variable_get('storminvoice_tcpdf_location', 'libraries/tcpdf');
if (file_exists($tcpdf_dir .'/tcpdf.php')) {
$node->content['links']['print']['pdf'] = array(
'#prefix' => '<dt class="stormcomponent print_pdf">',
@ -480,7 +480,7 @@ function theme_storminvoice_report($node, $report, $language) {
}
function theme_storminvoice_report_pdf($node, $language, $output = 'screen') {
$tcpdf_dir = variable_get('storminvoice_tcpdf_location', 'sites/all/libraries/tcpdf');
$tcpdf_dir = variable_get('storminvoice_tcpdf_location', 'libraries/tcpdf');
// Performs simple check for existance of tcpdf library . If it doesn't exist, revert to node display with message about tcpdf library.
if (!file_exists($tcpdf_dir .'/tcpdf.php')) {