diff --git a/.devilbox/www/htdocs/vendor/phpmyadmin-4.0/config.inc.php b/.devilbox/www/htdocs/vendor/phpmyadmin-4.0/config.inc.php index 52f09d25..49225dea 100644 --- a/.devilbox/www/htdocs/vendor/phpmyadmin-4.0/config.inc.php +++ b/.devilbox/www/htdocs/vendor/phpmyadmin-4.0/config.inc.php @@ -10,7 +10,7 @@ * @package PhpMyAdmin */ -error_reporting(-1); +error_reporting(0); $cfg['TempDir'] = '/tmp'; $cfg['CheckConfigurationPermissions'] = false; $cfg['blowfish_secret'] = 'GObO60^(04#^5637%fdUGo(*6$%6#dy4'; diff --git a/.devilbox/www/htdocs/vendor/phpmyadmin-4.0/config.sample.inc.php b/.devilbox/www/htdocs/vendor/phpmyadmin-4.0/config.sample.inc.php deleted file mode 100644 index e3d0f069..00000000 --- a/.devilbox/www/htdocs/vendor/phpmyadmin-4.0/config.sample.inc.php +++ /dev/null @@ -1,139 +0,0 @@ -. - * - * @package PhpMyAdmin - */ - -/* - * This is needed for cookie based authentication to encrypt password in - * cookie. Needs to be 32 chars long. - */ -$cfg['blowfish_secret'] = 'a8b7c6d'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */ - -/* - * Servers configuration - */ -$i = 0; - -/* - * First server - */ -$i++; -/* Authentication type */ -$cfg['Servers'][$i]['auth_type'] = 'cookie'; -/* Server parameters */ -$cfg['Servers'][$i]['host'] = 'localhost'; -$cfg['Servers'][$i]['connect_type'] = 'tcp'; -$cfg['Servers'][$i]['compress'] = false; -/* Select mysql if your server does not have mysqli */ -$cfg['Servers'][$i]['extension'] = 'mysqli'; -$cfg['Servers'][$i]['AllowNoPassword'] = false; - -/* - * phpMyAdmin configuration storage settings. - */ - -/* User used to manipulate with storage */ -// $cfg['Servers'][$i]['controlhost'] = ''; -// $cfg['Servers'][$i]['controluser'] = 'pma'; -// $cfg['Servers'][$i]['controlpass'] = 'pmapass'; - -/* Storage database and tables */ -// $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin'; -// $cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark'; -// $cfg['Servers'][$i]['relation'] = 'pma__relation'; -// $cfg['Servers'][$i]['table_info'] = 'pma__table_info'; -// $cfg['Servers'][$i]['table_coords'] = 'pma__table_coords'; -// $cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages'; -// $cfg['Servers'][$i]['column_info'] = 'pma__column_info'; -// $cfg['Servers'][$i]['history'] = 'pma__history'; -// $cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs'; -// $cfg['Servers'][$i]['tracking'] = 'pma__tracking'; -// $cfg['Servers'][$i]['designer_coords'] = 'pma__designer_coords'; -// $cfg['Servers'][$i]['userconfig'] = 'pma__userconfig'; -// $cfg['Servers'][$i]['recent'] = 'pma__recent'; - -/* - * End of servers configuration - */ - -/* - * Directories for saving/loading files from server - */ -$cfg['UploadDir'] = ''; -$cfg['SaveDir'] = ''; - -/** - * Defines whether a user should be displayed a "show all (records)" - * button in browse mode or not. - * default = false - */ -//$cfg['ShowAll'] = true; - -/** - * Number of rows displayed when browsing a result set. If the result - * set contains more rows, "Previous" and "Next". - * default = 30 - */ -//$cfg['MaxRows'] = 50; - -/** - * disallow editing of binary fields - * valid values are: - * false allow editing - * 'blob' allow editing except for BLOB fields - * 'noblob' disallow editing except for BLOB fields - * 'all' disallow editing - * default = blob - */ -//$cfg['ProtectBinary'] = 'false'; - -/** - * Default language to use, if not browser-defined or user-defined - * (you find all languages in the locale folder) - * uncomment the desired line: - * default = 'en' - */ -//$cfg['DefaultLang'] = 'en'; -//$cfg['DefaultLang'] = 'de'; - -/** - * default display direction (horizontal|vertical|horizontalflipped) - */ -//$cfg['DefaultDisplay'] = 'vertical'; - - -/** - * How many columns should be used for table display of a database? - * (a value larger than 1 results in some information being hidden) - * default = 1 - */ -//$cfg['PropertiesNumColumns'] = 2; - -/** - * Set to true if you want DB-based query history.If false, this utilizes - * JS-routines to display query history (lost by window close) - * - * This requires configuration storage enabled, see above. - * default = false - */ -//$cfg['QueryHistoryDB'] = true; - -/** - * When using DB-based query history, how many entries should be kept? - * - * default = 25 - */ -//$cfg['QueryHistoryMax'] = 100; - -/* - * You can find more configuration options in the documentation - * in the doc/ folder or at . - */ -?> diff --git a/.tests/tests/vendor-phpmyadmin.sh b/.tests/tests/vendor-phpmyadmin.sh index 18e3aee2..b8da83ce 100755 --- a/.tests/tests/vendor-phpmyadmin.sh +++ b/.tests/tests/vendor-phpmyadmin.sh @@ -84,16 +84,16 @@ else fi -# error_reporting(-1); -printf "[TEST] config.inc.php check: error_reporting(-1);" -if ! grep -E "^error_reporting\\(-1\\);" "${CONFIGPATH}" >/dev/null; then - printf "\\r[FAIL] config.inc.php check: error_reporting(-1);\\n" +# error_reporting(0); +printf "[TEST] config.inc.php check: error_reporting(0);" +if ! grep -E "^error_reporting\\(0\\);" "${CONFIGPATH}" >/dev/null; then + printf "\\r[FAIL] config.inc.php check: error_reporting(0);\\n" if ! grep 'error_reporting' "${CONFIGPATH}"; then cat "${CONFIGPATH}" fi exit 1 else - printf "\\r[OK] config.inc.php check: error_reporting(-1);\\n" + printf "\\r[OK] config.inc.php check: error_reporting(0);\\n" fi # $cfg['TempDir'] = '/tmp';