Skip to content

Commit d20fc02

Browse files
authored
Merge pull request #972 from bramley/remove_unused_init_settings
Remove obsolete settings and code
2 parents 5b1fabe + c8de0a7 commit d20fc02

File tree

2 files changed

+0
-49
lines changed

2 files changed

+0
-49
lines changed

public_html/lists/admin/index.php

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -614,15 +614,6 @@ function mb_strtolower($string)
614614
}
615615
}
616616

617-
/*
618-
if (USEFCK) {
619-
$imgdir = getenv("DOCUMENT_ROOT").$GLOBALS["pageroot"].'/'.FCKIMAGES_DIR.'/';
620-
if (!is_dir($imgdir) || !is_writeable ($imgdir)) {
621-
Warn("The FCK image directory does not exist, or is not writable");
622-
}
623-
}
624-
*/
625-
626617
/*
627618
*
628619
* show global news, based on the version in use
@@ -715,10 +706,6 @@ function mb_strtolower($string)
715706
*
716707
* **/
717708

718-
if (defined('USE_PDF') && USE_PDF && !defined('FPDF_VERSION')) {
719-
Warn($GLOBALS['I18N']->get('You are trying to use PDF support without having FPDF loaded'));
720-
}
721-
722709
if (WARN_ABOUT_PHP_SETTINGS && !$GLOBALS['commandline']) {
723710
if (strpos(getenv('REQUEST_URI'), $pageroot.'/admin') !== 0) {
724711
Warn(s(

public_html/lists/admin/init.php

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,6 @@
221221
if (!defined('REGISTER')) {
222222
define('REGISTER', 1);
223223
}
224-
if (!defined('USE_PDF')) {
225-
define('USE_PDF', 0);
226-
}
227224
if (!defined('VERBOSE')) {
228225
define('VERBOSE', 0);
229226
}
@@ -259,12 +256,6 @@
259256
if (!defined('PAGETEXTCREDITS')) {
260257
define('PAGETEXTCREDITS', 0);
261258
}
262-
if (!defined('USEFCK')) {
263-
define('USEFCK', 1);
264-
}
265-
if (!defined('USECK')) {
266-
define('USECK', 0);
267-
} //# ckeditor integration, not finished yet
268259
if (!defined('ASKFORPASSWORD')) {
269260
define('ASKFORPASSWORD', 0);
270261
}
@@ -331,9 +322,6 @@
331322
//# remember the length of a hashed string
332323
$hash_length = strlen(hash(HASH_ALGO, 'some text'));
333324

334-
if (!defined('PHPMAILER')) {
335-
define('PHPMAILER', 1);
336-
}
337325
if (!defined('WARN_ABOUT_PHP_SETTINGS')) {
338326
define('WARN_ABOUT_PHP_SETTINGS', 1);
339327
}
@@ -391,9 +379,6 @@
391379
if (!defined('USE_REPETITION')) {
392380
define('USE_REPETITION', 0);
393381
}
394-
if (!defined('USE_EDITMESSAGE')) {
395-
define('USE_EDITMESSAGE', 0);
396-
}
397382
if (!defined('FCKIMAGES_DIR')) {
398383
define('FCKIMAGES_DIR', 'uploadimages');
399384
}
@@ -424,9 +409,6 @@
424409
if (!defined('NAME')) {
425410
define('NAME', 'phpList');
426411
}
427-
if (!defined('USE_OUTLOOK_OPTIMIZED_HTML')) {
428-
define('USE_OUTLOOK_OPTIMIZED_HTML', 0);
429-
}
430412
if (!defined('EXPORT_EXCEL')) {
431413
define('EXPORT_EXCEL', 0);
432414
}
@@ -442,12 +424,6 @@
442424
if (!defined('USE_LIST_EXCLUDE')) {
443425
define('USE_LIST_EXCLUDE', 0);
444426
}
445-
if (!defined('WARN_SAVECHANGES')) {
446-
define('WARN_SAVECHANGES', 1);
447-
}
448-
if (!defined('STACKED_ATTRIBUTE_SELECTION')) {
449-
define('STACKED_ATTRIBUTE_SELECTION', 0);
450-
}
451427
if (!defined('ATTRIBUTEVALUE_REORDER_LIMIT')) {
452428
define('ATTRIBUTEVALUE_REORDER_LIMIT', 100);
453429
}
@@ -460,15 +436,6 @@
460436
if (!defined('CLICKTRACK_SHOWDETAIL')) {
461437
define('CLICKTRACK_SHOWDETAIL', 0);
462438
}
463-
if (!defined('USETINYMCEMESG')) {
464-
define('USETINYMCEMESG', 0);
465-
}
466-
if (!defined('USETINYMCETEMPL')) {
467-
define('USETINYMCETEMPL', 0);
468-
}
469-
if (!defined('TINYMCEPATH')) {
470-
define('TINYMCEPATH', '');
471-
}
472439
if (!defined('STATS_INTERVAL')) {
473440
define('STATS_INTERVAL', 'weekly');
474441
}
@@ -623,9 +590,6 @@
623590
if (!defined('MAX_MAILSIZE')) {
624591
define('MAX_MAILSIZE', 209715200);
625592
} // in bytes, 200Mb
626-
if (!defined('INTERFACELIB')) {
627-
define('INTERFACELIB', 1);
628-
}
629593
if (!defined('POP_BEFORE_SMTP')) {
630594
define('POP_BEFORE_SMTP', '');
631595
}

0 commit comments

Comments
 (0)