From 7add9936c9ce47a38c38addb9ea67b1d1324d29c Mon Sep 17 00:00:00 2001 From: s22-tech Date: Sun, 30 Jun 2024 18:50:29 -0700 Subject: [PATCH] Remove debug_logger() calls --- bookmarks/bookmark.php | 3 +- bookmarks/delete_bookmark.php | 3 +- bookmarks/edit_bookmark.php | 3 +- bookmarks/move_bookmark.php | 10 +--- bookmarks/new_bookmark.php | 12 +--- favicon.inc.php | 74 ------------------------- folders/folder.php | 18 +----- folders/move_folder.php | 15 +---- includes/app_header.inc.php | 2 - includes/async_header.inc.php | 5 +- includes/favicon.inc.php | 74 ------------------------- includes/favicons_list.php | 2 +- includes/footer.inc.php | 8 +-- includes/header.php | 5 +- index.php | 6 +- lib/--webstart.php | 18 +----- lib/boolean_search.php | 2 +- lib/lib.php | 15 +---- lib/login.php | 2 +- sidebar.php | 2 +- vendor/autoload.php | 2 +- vendor/composer/autoload_classmap.php | 2 +- vendor/composer/autoload_namespaces.php | 2 +- vendor/composer/autoload_psr4.php | 2 +- vendor/composer/autoload_real.php | 2 +- vendor/composer/autoload_static.php | 2 +- vendor/composer/platform_check.php | 2 +- vendor/simplehtmldom/HtmlDocument.php | 2 +- 28 files changed, 25 insertions(+), 270 deletions(-) diff --git a/bookmarks/bookmark.php b/bookmarks/bookmark.php index 59c83f1..feeeace 100644 --- a/bookmarks/bookmark.php +++ b/bookmarks/bookmark.php @@ -113,7 +113,6 @@ function list_bookmarks($bookmarks, $show_checkbox, $show_folder, $show_icon, $s echo '
' . PHP_EOL; -debug_logger(name:'BOOKMARKS', variable: $bookmarks, file: __FILE__, function: __FUNCTION__); foreach ($bookmarks as $value) { echo '
' . PHP_EOL; @@ -190,7 +189,6 @@ function list_bookmarks($bookmarks, $show_checkbox, $show_folder, $show_icon, $s // The favicon. echo $tab . '
' . PHP_EOL; echo $tab . $tab; -// echo '
'; print_r($value); echo '
'; //:debug if ($show_icon) { if ($value['favicon']) { /* && is_file($value['favicon']) */ echo ''. PHP_EOL; @@ -248,3 +246,4 @@ function set_last_visit($id) { xmlhttp.send(); } + diff --git a/bookmarks/delete_bookmark.php b/bookmarks/delete_bookmark.php index bc6761b..eb91d1b 100644 --- a/bookmarks/delete_bookmark.php +++ b/bookmarks/delete_bookmark.php @@ -156,11 +156,10 @@ function delete_bookmarks($bm_to_delete) { unlink(DOC_ROOT .'/icons/'. $favicon); } else { - debug_logger(name: 'ERROR -- Favicon was not found: ', variable: $favicon, file: __FILE__, function: __FUNCTION__); } } } // Close the window. echo ""; } -?> \ No newline at end of file +?> diff --git a/bookmarks/edit_bookmark.php b/bookmarks/edit_bookmark.php index 94aafb9..f106ff9 100644 --- a/bookmarks/edit_bookmark.php +++ b/bookmarks/edit_bookmark.php @@ -139,7 +139,6 @@ require_once(realpath(DOC_ROOT . '/includes/favicon.inc.php')); $favicon = new Favicon($used_url); $new_fav = $favicon->favicon; -debug_logger(name:'favicon->favicon >>', variable:$new_fav, file:__FILE__, function:__FUNCTION__); if ($new_fav) { $update_query = sprintf(" UPDATE `obm_bookmarks` @@ -152,7 +151,6 @@ $mysql->escape($username), $mysql->escape($bm_array[0]) ); -debug_logger(name:'bm-query', variable:$update_query, file:__FILE__, function:__FUNCTION__); if (!$mysql->query($update_query)) { message($mysql->error); } @@ -245,3 +243,4 @@ require_once(realpath(DOC_ROOT . '/includes/footer.inc.php')); ?> + diff --git a/bookmarks/move_bookmark.php b/bookmarks/move_bookmark.php index 99c7a1f..a2d5d3e 100644 --- a/bookmarks/move_bookmark.php +++ b/bookmarks/move_bookmark.php @@ -5,11 +5,9 @@ $folderid = set_get_folderid(); // This allows the root folder to be selected in the list. $bm_array = set_post_num_array('bmlist'); // Returns an array. -debug_logger( name:'bm_array-1', variable: print_r($bm_array, true), file: __FILE__, function: __FUNCTION__ ); if (count($bm_array) == 0) { $bm_array = set_get_num_array('bmlist'); // Returns an array from the URL. -debug_logger( name:'bm_array-2', variable: print_r($bm_array, true), file: __FILE__, function: __FUNCTION__ ); ?>

Move bookmarks to:

@@ -17,8 +15,6 @@
make_tree(0); @@ -41,11 +37,9 @@ query($query)) { -debug_logger( name:'success', variable: $query, file: __FILE__, function: __FUNCTION__ ); echo 'Bookmarks moved.
'. PHP_EOL; echo ''; } else { -debug_logger( name:'error', variable: $query, file: __FILE__, function: __FUNCTION__ ); message($mysql->error); } } -debug_logger( name:'------------', variable: 'separator', file: __FILE__, function: __FUNCTION__ ); require_once(realpath(DOC_ROOT . '/includes/footer.inc.php')); ?> + diff --git a/bookmarks/new_bookmark.php b/bookmarks/new_bookmark.php index 25124ec..9550bec 100644 --- a/bookmarks/new_bookmark.php +++ b/bookmarks/new_bookmark.php @@ -113,25 +113,18 @@ $bm_id = mysqli_insert_id($mysql->conn); // Returns the value generated for an AUTO_INCREMENT column by the last query. // https://www.php.net/manual/en/mysqli.insert-id.php // Using $mysql->insert_id produces "Undefined property: mysql::$insert_id". -// $bm_id = $pdo->lastInsertId(); // PDO equivalent -- https://www.php.net/pdo.lastinsertid } else { message($mysql->error); } unset($_SESSION['title'], $_SESSION['url']); -debug_logger(variable:$post_url, name:'post_url', file:__FILE__, function:__FUNCTION__); /////////////////////////// -// SAVE Favicon -// Saving the favicon in a separate second step is done because -// we want to make sure the bookmark is saved in any case, -// since the favicon is not as important. /////////////////////////// if ($settings['show_bookmark_icon']) { require_once(realpath(DOC_ROOT . '/includes/favicon.inc.php')); $favicon = new Favicon($post_url); -debug_logger(variable:print_r($favicon, true), name:'favicon-object', file:__FILE__, function:__FUNCTION__); if (!empty($favicon->favicon)) { $update_query = sprintf(" @@ -143,7 +136,6 @@ $mysql->escape($username), $mysql->escape($bm_id) ); -debug_logger(variable:$update_query, name:'update-query', file:__FILE__, function:__FUNCTION__); if (!$mysql->query($update_query)) { message($mysql->error); } @@ -151,8 +143,6 @@ } else { $icon = $bookmark_image; -debug_logger(variable:$icon, name:'favicon->favicon was NOT set', file:__FILE__, function:__FUNCTION__); -debug_logger(variable:debug_backtrace(), name:'debug_backtrace()', file:__FILE__, function:__FUNCTION__); } } @@ -170,4 +160,4 @@ } } require_once(realpath(DOC_ROOT . '/includes/footer.inc.php')); -?> \ No newline at end of file +?> diff --git a/favicon.inc.php b/favicon.inc.php index be2e454..c1ce1ce 100644 --- a/favicon.inc.php +++ b/favicon.inc.php @@ -34,8 +34,6 @@ function __construct($url) { $this->notes = ''; if ($settings['show_bookmark_icon']) { -debug_logger(name:'--------', variable: '-------------------------', file: '--------', function: '--------'); -debug_logger(name:'URL', variable: $url, newline: false, file: __FILE__, function: __FUNCTION__, time: true); if ($this->parsed_url = $this->return_parse_url($url)) { if ($this->favicon_url = $this->get_favicon_url()) { @@ -43,25 +41,17 @@ function __construct($url) { $this->icon_name = $this->rename_favicon($url . '/'. $this->temp_icon_name); $favicon_url_path = DOC_ROOT .'/icons/'. $this->icon_name; -debug_logger(name:'this->temp_icon_name', variable: $this->temp_icon_name, newline: false, file: __FILE__, function:__FUNCTION__); -debug_logger(name:'this->favicon_url', variable: $this->favicon_url, newline: false, file: __FILE__, function:__FUNCTION__); -debug_logger(name:'this->icon_name', variable: $this->icon_name, newline: false, file: __FILE__, function:__FUNCTION__); -debug_logger(name:'favicon_url_path', variable: $favicon_url_path, file: __FILE__, function:__FUNCTION__); $tmp_file = DOC_ROOT . '/tmp/'. $this->temp_icon_name; [$fav_ext, $ident, $icons] = $this->identify_fav($tmp_file); -debug_logger(name:'tmp_file', variable: $tmp_file, newline: false, file: __FILE__, function:__FUNCTION__); -debug_logger(name:'fav_ext', variable: $fav_ext, file: __FILE__, function:__FUNCTION__); if ($cfg['convert_favicons']) { $this->favicon = $this->convert_favicon($tmp_file, $fav_ext, $ident, $icons); -debug_logger(name:'converted favicon', variable: $this->favicon, file: __FILE__, function:__FUNCTION__); } else { // Move the file from the tmp dir. rename($tmp_file, $favicon_url_path); $this->favicon = $favicon_url_path; -debug_logger(name:'no conversion favicon', variable: $this->favicon, file: __FILE__, function:__FUNCTION__); } } else { @@ -87,29 +77,19 @@ function convert_favicon($tmp_file, $fav_ext, $ident, $icons) : string { $tmp_ext = pathinfo($tmp_file, PATHINFO_EXTENSION); $new_ext = 'png'; -debug_logger(name:'ident-stat', variable: $ident, newline: false, file: __FILE__, function:__FUNCTION__); -debug_logger(name:'tmp_file', variable: $tmp_file, newline: false, file: __FILE__, function:__FUNCTION__); -debug_logger(name:'tmp_ext', variable: $tmp_ext, newline: false, file: __FILE__, function:__FUNCTION__); -debug_logger(name:'fav_ext', variable: $fav_ext, newline: false, file: __FILE__, function:__FUNCTION__); -debug_logger(name:'icons', variable: $icons, newline: false, file: __FILE__, function:__FUNCTION__); $new_name = $this->icon_name; -debug_logger(name:'new_name1', variable: $new_name, newline: false, file: __FILE__, function:__FUNCTION__); $converted_file_path = DOC_ROOT . '/tmp/'. $new_name; $save_path_name = DOC_ROOT . '/icons/'. $new_name; if ($ident && $fav_ext !== 'svg') { $new_name = str_replace($tmp_ext, $new_ext, $new_name); -debug_logger(name:'new_name2', variable: $new_name, newline: false, file: __FILE__, function:__FUNCTION__); $converted_file_path = DOC_ROOT . '/tmp/'. $new_name; -debug_logger(name:'converted_file_path', variable: $converted_file_path, newline: false, file: __FILE__, function:__FUNCTION__); $convert = "{$cfg['convert']} $tmp_file -resize {$cfg['icon_size']}\> -unsharp 0x1 $converted_file_path"; -debug_logger(name:'convert-cmd', variable: $convert, newline: false, file: __FILE__, function:__FUNCTION__); // Convert image to .png, and resize to $cfg['icon_size'] if original is different. ## https://legacy.imagemagick.org/Usage/resize/ system($convert, $status); -debug_logger(name:'SUCCESS--conversion status', variable: $status, file: __FILE__, function:__FUNCTION__); if (count($icons) > 1) { $multi_ico_name = str_replace('.'.$new_ext, '-0.'.$new_ext, $converted_file_path); @@ -124,14 +104,9 @@ function convert_favicon($tmp_file, $fav_ext, $ident, $icons) : string { $tmp_file .= '.'. $tmp_ext; } $rename = rename($tmp_file.'.png', $save_path_name); // Move & rename the file. -debug_logger(name:'MOVED--no conversion', variable: $this->icon_name, newline: false, file: __FILE__, function:__FUNCTION__); -debug_logger(name:'tmp_file2', variable: $tmp_file, newline: false, file: __FILE__, function:__FUNCTION__); -debug_logger(name:'save_path_name2', variable: $save_path_name, newline: false, file: __FILE__, function:__FUNCTION__); -debug_logger(name:'rename-move2', variable: $rename, file: __FILE__, function:__FUNCTION__); } if (file_exists($tmp_file)) { - debug_logger(name:'tmp_file_exists - YES', variable:'', file: __FILE__, function:__FUNCTION__); unlink($tmp_file); } if (count($icons) > 1) { @@ -154,14 +129,11 @@ function convert_favicon($tmp_file, $fav_ext, $ident, $icons) : string { function download_favicon_image() { global $cfg; $save_path_name = DOC_ROOT . '/tmp/'. $this->temp_icon_name; -debug_logger(name:'this->favicon_url', variable: $this->favicon_url, newline: false, file: __FILE__, function: __FUNCTION__); -debug_logger(name:'temp_icon_name', variable: $save_path_name, newline: false, file: __FILE__, function: __FUNCTION__); if (str_contains($this->favicon_url, 'base64')) { $this->notes = 'This favicon was in base64.'; $data = preg_replace("#$this->url#", '', $this->favicon_url); file_put_contents($save_path_name.'.png', file_get_contents($data)); -debug_logger(name:'data', variable: $data, newline: false, file: __FILE__, function: __FUNCTION__); } else { $open_file_in_binary = fopen($save_path_name, 'wb'); @@ -185,12 +157,9 @@ function download_favicon_image() { // Close the file pointer. fclose($open_file_in_binary); -debug_logger(name:'response', variable: $response, file: __FILE__, function: __FUNCTION__); } if (admin_only()) { -// $bytes = file_put_contents($save_path_name, $response); -// debug_logger(name:'bytes saved', variable: $bytes, file: __FILE__, function: __FUNCTION__); } return true; @@ -201,7 +170,6 @@ function download_favicon_image() { function get_favicon_url() { $host_url = $this->parsed_url['scheme'] . '://' . $this->parsed_url['host']; $host_url = rtrim($host_url, '/'); -debug_logger(name:'host_url', variable: $host_url, newline: false, file: __FILE__, function:__FUNCTION__); ## https://github.com/simplehtmldom/simplehtmldom ## https://sourceforge.net/p/simplehtmldom/bugs/ @@ -209,35 +177,25 @@ function get_favicon_url() { $dom = new HtmlWeb(); $html = $dom->load($host_url); -// DOES THIS SECTION DO ANYTHING BENEFICIAL? if (empty($html)) { -// sleep(3); -// $html_string = $this->scrape_html($host_url); -// $html = str_get_html($html_string); -// if (empty($html)) { echo '• favicon.php — $html is blank.
'; return; -// } } -debug_logger(name:'html', variable: $html, file: __FILE__, function:__FUNCTION__); $favicon_url = ''; foreach ($html->find('link') as $e) { if (!empty($e->rel)) { if (strtolower(trim($e->rel)) === 'shortcut icon' || strtolower(trim($e->rel)) === 'icon') { -debug_logger(name:'••• e->rel', variable: $e->rel, newline: false, file: __FILE__, function:__FUNCTION__); $favicon_url = $e->href; break; } elseif (strtolower(trim($e->rel)) === 'apple-touch-icon') { -debug_logger(name:'••• e->rel', variable: $e->rel, newline: false, file: __FILE__, function:__FUNCTION__); $favicon_url = $e->href; break; } } } - debug_logger(name:'get-favicon--ORIG', variable: $favicon_url, newline: false, file: __FILE__, function:__FUNCTION__); if (empty($favicon_url)) return; // So as not to populate the /tmp/ directory. @@ -249,21 +207,17 @@ function get_favicon_url() { // If link doesn't start with http... if (str_starts_with($favicon_url, '//')) { $favicon_url = 'https:'. $favicon_url; - debug_logger(name:'get-favicon--2', variable: $favicon_url, newline: false, file: __FILE__, function: __FUNCTION__); } elseif (str_starts_with($favicon_url, '/')) { $favicon_url = $host_url . $favicon_url; - debug_logger(name:'get-favicon--3', variable: $favicon_url, newline: false, file: __FILE__, function: __FUNCTION__); } elseif (!str_starts_with($favicon_url, 'http')) { $favicon_url = $host_url .'/'. $favicon_url; - debug_logger(name:'get-favicon--4', variable: $favicon_url, newline: false, file: __FILE__, function: __FUNCTION__); } $html->clear(); unset($html); - debug_logger(name:'get-favicon--FINAL', variable: $favicon_url, file: __FILE__, function: __FUNCTION__); $this->temp_icon_name = basename(parse_url($favicon_url, PHP_URL_PATH)); @@ -304,7 +258,6 @@ function return_parse_url($url) { $parsed['scheme'] = 'https'; } if (empty($parsed['host']) || $parsed['host'] == '') { - debug_logger(name:'parsed[host]', variable: $parsed['host'], file: __FILE__, function: __FUNCTION__); return false; } if (empty($parsed['port']) || $parsed['port'] == '') { @@ -325,15 +278,9 @@ function rename_favicon($domain) { $parsed = parse_url($domain); $host_name = $parsed['host']; $host_name = str_replace('.', '-', $host_name); -// $parts = explode('-', $host_name); -// $last = array_pop($parts); -// $parts = [implode('-', $parts), $last]; // Get domain w/o the domain extension. -// $host_name = $parts[0]; -// debug_logger(name:'•••host_name', variable: $host_name, newline: false, file: __FILE__, function:__FUNCTION__); $host_name = str_replace('www-', '', $host_name); $ext = pathinfo($this->favicon_url, PATHINFO_EXTENSION); $ext = strlen($ext) < 3 ? 'png' : $ext; -debug_logger(name:'•••favicon_name', variable: $host_name . '.' . $ext, file: __FILE__, function:__FUNCTION__); return $host_name . '.' . $ext; } @@ -342,8 +289,6 @@ function identify_fav($tmp_file) { global $cfg; $tmp_ext = pathinfo($tmp_file, PATHINFO_EXTENSION); exec($cfg['identify'] .' '. $tmp_file, $output); -debug_logger(name:'identify output', variable: $output, newline: false, file: __FILE__, function:__FUNCTION__); -debug_logger(name:'identify tmp_file', variable: $tmp_file, newline: false, file: __FILE__, function:__FUNCTION__); $icons = []; if ($output) { @@ -353,15 +298,11 @@ function identify_fav($tmp_file) { } $idents = explode(' ', $output[0]); $file_ext = strtolower($idents[1]); -debug_logger(name:'identify idents[0]', variable: $idents[0], newline: false, file: __FILE__, function:__FUNCTION__); -debug_logger(name:'identify idents[1]', variable: $file_ext, newline: false, file: __FILE__, function:__FUNCTION__); $file_ext = ($file_ext === 'jpeg') ? 'jpg' : $file_ext; -debug_logger(name:'identify file_ext', variable: $file_ext, newline: false, file: __FILE__, function:__FUNCTION__); return [$file_ext, true, $icons]; } else { -debug_logger(name:'identify return', variable:'', newline: false, file: __FILE__, function:__FUNCTION__); return ['png', false, $icons]; } } @@ -392,18 +333,3 @@ function get_current_url($url) { } -__halt_compiler(); - -Test Icons -• hostinger.com has an ICI file with multiple images -• some site ??? had a base64 image -- Which one was it? - -debug_logger(name:$name, variable: $variable, $type, $file, $function) -prints out: -error_log('• '. basename($file) .':'.$function.'()->$'. $name .': '. $variable . PHP_EOL, 3, $cfg['error_log']); -e.g.: -• favicon.php:__construct()->$__construct1: https://www.invizbox.com/products/invizbox-2-pro/#select-plan - -NOTES: -• If the site's favicon is an svg image, DO NOT convert it. It looks terrible as a png. -• Don't convert icons to jpg. JPEG doesn't offer transparency, so there may be black banding if the image isn't square. diff --git a/folders/folder.php b/folders/folder.php index 7cc5740..aa4891a 100644 --- a/folders/folder.php +++ b/folders/folder.php @@ -27,9 +27,7 @@ function __construct($user=false) { $this->get_children = []; $this->level = 0; $this->foreign_username = false; -// echo '$user: '. $user . '
'; -// This section collapses the folder tree upon bookmark deletions, etc. Why??? if ($user) { $this->get_shared_data($user); } @@ -64,10 +62,6 @@ function get_user_data() { ORDER BY `name`", $mysql->escape($_SESSION['username']) ); -// echo '
Result:' . PHP_EOL;
-// print_r(mysqli_fetch_assoc($mysql->result));
-// echo 'username: '. $_SESSION['username'] . PHP_EOL;
-// echo '
'; if ($mysql->query($query)) { while ($row = mysqli_fetch_assoc($mysql->result)) { $this->folders[$row['id']] = $row; @@ -195,11 +189,6 @@ function print_tree($scriptname='', $bmlist='') { // The top folder shows up too high at the top. Draw a little space there. echo '
' . PHP_EOL; -// usort($this->tree, function ($folder1, $folder2) { -// return $folder1['name'] <=> $folder2['name']; -// }); -// array_multisort(array_column($this->tree, 'name'), SORT_ASC, SORT_NATURAL|SORT_FLAG_CASE, $this->tree); -// echo '
'; print_r($this->tree); echo '
'; foreach ($this->tree as $key => $value) { // This is the begining of the line that shows a folder @@ -207,7 +196,6 @@ function print_tree($scriptname='', $bmlist='') { $spacer = '
'; echo $spacer; -// echo 'v: '. $value['id'] .' — f: '. $this->folderid . '
'; if ($value['id'] == $this->folderid) { $folder_name = '' . $value['name'] . ''; if (!$this->foreign_username && $value['public']) { @@ -311,15 +299,10 @@ function add_to_expand_list($id) { ### a given folder up to the root folder. ### function get_path_to_root($id) { -// echo '$id: '. $id . '
'; $path = []; while ($id > 0) { array_push($path, $id); -// echo '
';
-// print_r($path);
-// echo 'x: '. $this->folders[$id] . '
';
-// echo '
'; if (empty($this->folders[$id])) { echo "Folder #{$id} does not have a parent"; //:debug @@ -361,3 +344,4 @@ function get_children($id) { } } } + diff --git a/folders/move_folder.php b/folders/move_folder.php index ac4fda7..7720b6b 100644 --- a/folders/move_folder.php +++ b/folders/move_folder.php @@ -8,11 +8,6 @@ $tree = new Folder(); $parents = $tree->get_path_to_root($folderid); -// echo '$_SESSION[expand]: '. print_r($_SESSION['expand'], true) .'
'. PHP_EOL; -// echo '$sourcefolder: '. $sourcefolder .'
'. PHP_EOL; -// echo '$folderid: '. $folderid .'
'. PHP_EOL; -// echo '$parents: '. print_r($parents, true) .'
'. PHP_EOL; -// echo '$_POST: '. print_r($_POST, true) .'
'. PHP_EOL; /* • A folder can't be moved up to the main level (folderid = 0). Why??? @@ -28,10 +23,6 @@
make_tree(0); $tree->print_tree(); ?> @@ -47,7 +38,6 @@ @@ -70,17 +60,14 @@ ); if ($mysql->query ($query)) { -debug_logger( name:'success-query', variable: $query, file: __FILE__, function: __FUNCTION__ ); echo 'Folder moved
' . PHP_EOL; echo ''; } else { -debug_logger( name:'error-query', variable: $query, file: __FILE__, function: __FUNCTION__ ); message ($mysql->error); } } -debug_logger( name:'------------', variable: 'separator', file: __FILE__, function: __FUNCTION__ ); require_once(realpath(DOC_ROOT . '/includes/footer.inc.php')); -?> \ No newline at end of file +?> diff --git a/includes/app_header.inc.php b/includes/app_header.inc.php index ed24aa2..34ca23a 100644 --- a/includes/app_header.inc.php +++ b/includes/app_header.inc.php @@ -38,5 +38,3 @@ $settings['private_mode'] = 1; } -// $settings['private_mode'] = set_post_bool_var('settings_private_mode', false); -// It's too early to call this here. \ No newline at end of file diff --git a/includes/async_header.inc.php b/includes/async_header.inc.php index 145af82..cddb9e6 100644 --- a/includes/async_header.inc.php +++ b/includes/async_header.inc.php @@ -7,7 +7,6 @@ ob_start('ob_gzhandler'); } -// require_once(realpath(DOC_ROOT . '/lib/webstart.php')); if (! is_file(realpath(DOC_ROOT . '/config/config.php'))) { die ('You have to install OpenBookmark.'); } @@ -23,12 +22,10 @@ require_once(realpath(DOC_ROOT . '/lib/lib.php')); require_once(realpath(DOC_ROOT . '/lib/login.php')); -// if (is_file(realpath(DOC_ROOT . '/install/install.php'))) { -// message ('Remove "/install/install.php" before using OpenBookmark.'); -// } if ($display_login_form) { $auth->display_login_form(); require_once(realpath(DOC_ROOT . '/includes/footer.inc.php')); } + diff --git a/includes/favicon.inc.php b/includes/favicon.inc.php index be2e454..c1ce1ce 100644 --- a/includes/favicon.inc.php +++ b/includes/favicon.inc.php @@ -34,8 +34,6 @@ function __construct($url) { $this->notes = ''; if ($settings['show_bookmark_icon']) { -debug_logger(name:'--------', variable: '-------------------------', file: '--------', function: '--------'); -debug_logger(name:'URL', variable: $url, newline: false, file: __FILE__, function: __FUNCTION__, time: true); if ($this->parsed_url = $this->return_parse_url($url)) { if ($this->favicon_url = $this->get_favicon_url()) { @@ -43,25 +41,17 @@ function __construct($url) { $this->icon_name = $this->rename_favicon($url . '/'. $this->temp_icon_name); $favicon_url_path = DOC_ROOT .'/icons/'. $this->icon_name; -debug_logger(name:'this->temp_icon_name', variable: $this->temp_icon_name, newline: false, file: __FILE__, function:__FUNCTION__); -debug_logger(name:'this->favicon_url', variable: $this->favicon_url, newline: false, file: __FILE__, function:__FUNCTION__); -debug_logger(name:'this->icon_name', variable: $this->icon_name, newline: false, file: __FILE__, function:__FUNCTION__); -debug_logger(name:'favicon_url_path', variable: $favicon_url_path, file: __FILE__, function:__FUNCTION__); $tmp_file = DOC_ROOT . '/tmp/'. $this->temp_icon_name; [$fav_ext, $ident, $icons] = $this->identify_fav($tmp_file); -debug_logger(name:'tmp_file', variable: $tmp_file, newline: false, file: __FILE__, function:__FUNCTION__); -debug_logger(name:'fav_ext', variable: $fav_ext, file: __FILE__, function:__FUNCTION__); if ($cfg['convert_favicons']) { $this->favicon = $this->convert_favicon($tmp_file, $fav_ext, $ident, $icons); -debug_logger(name:'converted favicon', variable: $this->favicon, file: __FILE__, function:__FUNCTION__); } else { // Move the file from the tmp dir. rename($tmp_file, $favicon_url_path); $this->favicon = $favicon_url_path; -debug_logger(name:'no conversion favicon', variable: $this->favicon, file: __FILE__, function:__FUNCTION__); } } else { @@ -87,29 +77,19 @@ function convert_favicon($tmp_file, $fav_ext, $ident, $icons) : string { $tmp_ext = pathinfo($tmp_file, PATHINFO_EXTENSION); $new_ext = 'png'; -debug_logger(name:'ident-stat', variable: $ident, newline: false, file: __FILE__, function:__FUNCTION__); -debug_logger(name:'tmp_file', variable: $tmp_file, newline: false, file: __FILE__, function:__FUNCTION__); -debug_logger(name:'tmp_ext', variable: $tmp_ext, newline: false, file: __FILE__, function:__FUNCTION__); -debug_logger(name:'fav_ext', variable: $fav_ext, newline: false, file: __FILE__, function:__FUNCTION__); -debug_logger(name:'icons', variable: $icons, newline: false, file: __FILE__, function:__FUNCTION__); $new_name = $this->icon_name; -debug_logger(name:'new_name1', variable: $new_name, newline: false, file: __FILE__, function:__FUNCTION__); $converted_file_path = DOC_ROOT . '/tmp/'. $new_name; $save_path_name = DOC_ROOT . '/icons/'. $new_name; if ($ident && $fav_ext !== 'svg') { $new_name = str_replace($tmp_ext, $new_ext, $new_name); -debug_logger(name:'new_name2', variable: $new_name, newline: false, file: __FILE__, function:__FUNCTION__); $converted_file_path = DOC_ROOT . '/tmp/'. $new_name; -debug_logger(name:'converted_file_path', variable: $converted_file_path, newline: false, file: __FILE__, function:__FUNCTION__); $convert = "{$cfg['convert']} $tmp_file -resize {$cfg['icon_size']}\> -unsharp 0x1 $converted_file_path"; -debug_logger(name:'convert-cmd', variable: $convert, newline: false, file: __FILE__, function:__FUNCTION__); // Convert image to .png, and resize to $cfg['icon_size'] if original is different. ## https://legacy.imagemagick.org/Usage/resize/ system($convert, $status); -debug_logger(name:'SUCCESS--conversion status', variable: $status, file: __FILE__, function:__FUNCTION__); if (count($icons) > 1) { $multi_ico_name = str_replace('.'.$new_ext, '-0.'.$new_ext, $converted_file_path); @@ -124,14 +104,9 @@ function convert_favicon($tmp_file, $fav_ext, $ident, $icons) : string { $tmp_file .= '.'. $tmp_ext; } $rename = rename($tmp_file.'.png', $save_path_name); // Move & rename the file. -debug_logger(name:'MOVED--no conversion', variable: $this->icon_name, newline: false, file: __FILE__, function:__FUNCTION__); -debug_logger(name:'tmp_file2', variable: $tmp_file, newline: false, file: __FILE__, function:__FUNCTION__); -debug_logger(name:'save_path_name2', variable: $save_path_name, newline: false, file: __FILE__, function:__FUNCTION__); -debug_logger(name:'rename-move2', variable: $rename, file: __FILE__, function:__FUNCTION__); } if (file_exists($tmp_file)) { - debug_logger(name:'tmp_file_exists - YES', variable:'', file: __FILE__, function:__FUNCTION__); unlink($tmp_file); } if (count($icons) > 1) { @@ -154,14 +129,11 @@ function convert_favicon($tmp_file, $fav_ext, $ident, $icons) : string { function download_favicon_image() { global $cfg; $save_path_name = DOC_ROOT . '/tmp/'. $this->temp_icon_name; -debug_logger(name:'this->favicon_url', variable: $this->favicon_url, newline: false, file: __FILE__, function: __FUNCTION__); -debug_logger(name:'temp_icon_name', variable: $save_path_name, newline: false, file: __FILE__, function: __FUNCTION__); if (str_contains($this->favicon_url, 'base64')) { $this->notes = 'This favicon was in base64.'; $data = preg_replace("#$this->url#", '', $this->favicon_url); file_put_contents($save_path_name.'.png', file_get_contents($data)); -debug_logger(name:'data', variable: $data, newline: false, file: __FILE__, function: __FUNCTION__); } else { $open_file_in_binary = fopen($save_path_name, 'wb'); @@ -185,12 +157,9 @@ function download_favicon_image() { // Close the file pointer. fclose($open_file_in_binary); -debug_logger(name:'response', variable: $response, file: __FILE__, function: __FUNCTION__); } if (admin_only()) { -// $bytes = file_put_contents($save_path_name, $response); -// debug_logger(name:'bytes saved', variable: $bytes, file: __FILE__, function: __FUNCTION__); } return true; @@ -201,7 +170,6 @@ function download_favicon_image() { function get_favicon_url() { $host_url = $this->parsed_url['scheme'] . '://' . $this->parsed_url['host']; $host_url = rtrim($host_url, '/'); -debug_logger(name:'host_url', variable: $host_url, newline: false, file: __FILE__, function:__FUNCTION__); ## https://github.com/simplehtmldom/simplehtmldom ## https://sourceforge.net/p/simplehtmldom/bugs/ @@ -209,35 +177,25 @@ function get_favicon_url() { $dom = new HtmlWeb(); $html = $dom->load($host_url); -// DOES THIS SECTION DO ANYTHING BENEFICIAL? if (empty($html)) { -// sleep(3); -// $html_string = $this->scrape_html($host_url); -// $html = str_get_html($html_string); -// if (empty($html)) { echo '• favicon.php — $html is blank.
'; return; -// } } -debug_logger(name:'html', variable: $html, file: __FILE__, function:__FUNCTION__); $favicon_url = ''; foreach ($html->find('link') as $e) { if (!empty($e->rel)) { if (strtolower(trim($e->rel)) === 'shortcut icon' || strtolower(trim($e->rel)) === 'icon') { -debug_logger(name:'••• e->rel', variable: $e->rel, newline: false, file: __FILE__, function:__FUNCTION__); $favicon_url = $e->href; break; } elseif (strtolower(trim($e->rel)) === 'apple-touch-icon') { -debug_logger(name:'••• e->rel', variable: $e->rel, newline: false, file: __FILE__, function:__FUNCTION__); $favicon_url = $e->href; break; } } } - debug_logger(name:'get-favicon--ORIG', variable: $favicon_url, newline: false, file: __FILE__, function:__FUNCTION__); if (empty($favicon_url)) return; // So as not to populate the /tmp/ directory. @@ -249,21 +207,17 @@ function get_favicon_url() { // If link doesn't start with http... if (str_starts_with($favicon_url, '//')) { $favicon_url = 'https:'. $favicon_url; - debug_logger(name:'get-favicon--2', variable: $favicon_url, newline: false, file: __FILE__, function: __FUNCTION__); } elseif (str_starts_with($favicon_url, '/')) { $favicon_url = $host_url . $favicon_url; - debug_logger(name:'get-favicon--3', variable: $favicon_url, newline: false, file: __FILE__, function: __FUNCTION__); } elseif (!str_starts_with($favicon_url, 'http')) { $favicon_url = $host_url .'/'. $favicon_url; - debug_logger(name:'get-favicon--4', variable: $favicon_url, newline: false, file: __FILE__, function: __FUNCTION__); } $html->clear(); unset($html); - debug_logger(name:'get-favicon--FINAL', variable: $favicon_url, file: __FILE__, function: __FUNCTION__); $this->temp_icon_name = basename(parse_url($favicon_url, PHP_URL_PATH)); @@ -304,7 +258,6 @@ function return_parse_url($url) { $parsed['scheme'] = 'https'; } if (empty($parsed['host']) || $parsed['host'] == '') { - debug_logger(name:'parsed[host]', variable: $parsed['host'], file: __FILE__, function: __FUNCTION__); return false; } if (empty($parsed['port']) || $parsed['port'] == '') { @@ -325,15 +278,9 @@ function rename_favicon($domain) { $parsed = parse_url($domain); $host_name = $parsed['host']; $host_name = str_replace('.', '-', $host_name); -// $parts = explode('-', $host_name); -// $last = array_pop($parts); -// $parts = [implode('-', $parts), $last]; // Get domain w/o the domain extension. -// $host_name = $parts[0]; -// debug_logger(name:'•••host_name', variable: $host_name, newline: false, file: __FILE__, function:__FUNCTION__); $host_name = str_replace('www-', '', $host_name); $ext = pathinfo($this->favicon_url, PATHINFO_EXTENSION); $ext = strlen($ext) < 3 ? 'png' : $ext; -debug_logger(name:'•••favicon_name', variable: $host_name . '.' . $ext, file: __FILE__, function:__FUNCTION__); return $host_name . '.' . $ext; } @@ -342,8 +289,6 @@ function identify_fav($tmp_file) { global $cfg; $tmp_ext = pathinfo($tmp_file, PATHINFO_EXTENSION); exec($cfg['identify'] .' '. $tmp_file, $output); -debug_logger(name:'identify output', variable: $output, newline: false, file: __FILE__, function:__FUNCTION__); -debug_logger(name:'identify tmp_file', variable: $tmp_file, newline: false, file: __FILE__, function:__FUNCTION__); $icons = []; if ($output) { @@ -353,15 +298,11 @@ function identify_fav($tmp_file) { } $idents = explode(' ', $output[0]); $file_ext = strtolower($idents[1]); -debug_logger(name:'identify idents[0]', variable: $idents[0], newline: false, file: __FILE__, function:__FUNCTION__); -debug_logger(name:'identify idents[1]', variable: $file_ext, newline: false, file: __FILE__, function:__FUNCTION__); $file_ext = ($file_ext === 'jpeg') ? 'jpg' : $file_ext; -debug_logger(name:'identify file_ext', variable: $file_ext, newline: false, file: __FILE__, function:__FUNCTION__); return [$file_ext, true, $icons]; } else { -debug_logger(name:'identify return', variable:'', newline: false, file: __FILE__, function:__FUNCTION__); return ['png', false, $icons]; } } @@ -392,18 +333,3 @@ function get_current_url($url) { } -__halt_compiler(); - -Test Icons -• hostinger.com has an ICI file with multiple images -• some site ??? had a base64 image -- Which one was it? - -debug_logger(name:$name, variable: $variable, $type, $file, $function) -prints out: -error_log('• '. basename($file) .':'.$function.'()->$'. $name .': '. $variable . PHP_EOL, 3, $cfg['error_log']); -e.g.: -• favicon.php:__construct()->$__construct1: https://www.invizbox.com/products/invizbox-2-pro/#select-plan - -NOTES: -• If the site's favicon is an svg image, DO NOT convert it. It looks terrible as a png. -• Don't convert icons to jpg. JPEG doesn't offer transparency, so there may be black banding if the image isn't square. diff --git a/includes/favicons_list.php b/includes/favicons_list.php index 5d155b5..b30d290 100644 --- a/includes/favicons_list.php +++ b/includes/favicons_list.php @@ -1,6 +1,5 @@ 'amazon.png', @@ -15,3 +14,4 @@ 'wikipedia.org' => 'wikipedia.png', 'youtube.com' => 'youtube.png', ]; + diff --git a/includes/footer.inc.php b/includes/footer.inc.php index 66e1d07..c8a4aa4 100644 --- a/includes/footer.inc.php +++ b/includes/footer.inc.php @@ -28,14 +28,8 @@ echo '$_SERVER: '. print_r($_SERVER, true) . '

'; echo ''; } -// if (isset($_SESSION['logged_in']) && $_SESSION['logged_in'] == 1) { -// echo '
';
-// 		echo '$_SESSION: '. print_r($_SESSION, true) . '
 
';
-// 
-// 		echo '$_SERVER: '. print_r($_SERVER, true) . '
 
';
-// 		echo '
'; -// } ?> + diff --git a/includes/header.php b/includes/header.php index a2db718..40f7334 100644 --- a/includes/header.php +++ b/includes/header.php @@ -27,13 +27,10 @@ display_login_form(); require_once(realpath(DOC_ROOT .'/footer.inc.php')); } -?> \ No newline at end of file +?> diff --git a/index.php b/index.php index 478553f..1ab0a67 100644 --- a/index.php +++ b/index.php @@ -32,7 +32,6 @@ $('#' + $(this).attr('target')).toggle('blind', options, 300); }); -// setupFolderIntercepts(); // #1 setupBookmarkIntercepts(); $('#gsearchtext').focus(); @@ -289,9 +288,6 @@ function setupBookmarkIntercepts() { message($mysql->error); } -// echo 'folderid: '. $folderid . '
'; -// print_r_pre($_SESSION); -// print_r_pre($_POST); ?> @@ -342,4 +338,4 @@ function setupBookmarkIntercepts() { /* It listens for the onscroll event on the window and updates a localStorage item called "scroll_pos" each time the onscroll event fires. */ - \ No newline at end of file + diff --git a/lib/--webstart.php b/lib/--webstart.php index 67cf652..98ec9d4 100644 --- a/lib/--webstart.php +++ b/lib/--webstart.php @@ -34,20 +34,4 @@ } } -// function &fix_magic_quotes(&$arr) { -// foreach ($arr as $key => $val) { -// if (is_array($val)) { -// fix_magic_quotes($arr[$key]); -// } -// else { -// $arr[$key] = stripslashes($val); -// } -// } -// return $arr; -// } -// -// fix_magic_quotes($_COOKIE); -// fix_magic_quotes($_ENV); -// fix_magic_quotes($_GET); -// fix_magic_quotes($_POST); -// fix_magic_quotes($_REQUEST); + diff --git a/lib/boolean_search.php b/lib/boolean_search.php index 3eee9f3..3d09cd2 100644 --- a/lib/boolean_search.php +++ b/lib/boolean_search.php @@ -3,7 +3,6 @@ * Search lib by John-Paul Durrieu */ -// Token types define('TOKEN_STRING', 0); define('TOKEN_AND', 1); define('TOKEN_OR', 2); @@ -273,3 +272,4 @@ function assemble_query($criteria, $searchfields) { return $query; } + diff --git a/lib/lib.php b/lib/lib.php index 962effe..82e27f7 100644 --- a/lib/lib.php +++ b/lib/lib.php @@ -61,7 +61,6 @@ function input_validation($data, $charset = 'UTF-8') { else { $data = htmlentities(trim($data), ENT_QUOTES, $charset); } -// debug_logger(name:'LIB-data', variable:$data, file:__FILE__, function:__FUNCTION__); return $data; } @@ -580,8 +579,6 @@ function get_current_url($url) { $code = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL); curl_close($ch); -// echo '
'; print_r($parts); echo '
'; -// $scheme = parse_url($code, PHP_URL_SCHEME); $host = parse_url($code, PHP_URL_HOST); return $host; @@ -608,21 +605,10 @@ function debug_logger($name, $variable, $file, $function, $newline=true, $time=' } -function print_r_pre($object, $title='') { echo '
';
 	if (!empty($title)) echo '$'. $title .' -- ';
 	print_r($object);
 	echo  '
'; -// if (is_array($object)) { -// echo '
';
-// 		print_r($object);
-// 		echo  '
'; -// } -// else { -// echo '
';
-//       var_dump($object);
-// 		echo  '
'; -// } } @@ -633,3 +619,4 @@ function mysql_result($result, $number, $field=0) { return $row[$field]; } } + diff --git a/lib/login.php b/lib/login.php index 07a54b9..fa5c1b5 100644 --- a/lib/login.php +++ b/lib/login.php @@ -59,7 +59,6 @@ } $_SESSION['settings'] = $settings; -// echo '
'; print_r($_SESSION['settings']); echo '
'; function default_settings() { $settings = [ @@ -104,3 +103,4 @@ function default_settings() { // Set some often used vars. $folderid = set_get_folderid(); $expand = set_get_expand(); + diff --git a/sidebar.php b/sidebar.php index 944b9d3..962d818 100644 --- a/sidebar.php +++ b/sidebar.php @@ -1,7 +1,6 @@ + diff --git a/vendor/autoload.php b/vendor/autoload.php index bd5c22a..5ddfd59 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -1,6 +1,5 @@ $vendorDir . '/simplehtmldom/simplehtmldom/HtmlNode.php', 'simplehtmldom\\HtmlWeb' => $vendorDir . '/simplehtmldom/simplehtmldom/HtmlWeb.php', ); + diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php index 15a2ff3..f20ca74 100644 --- a/vendor/composer/autoload_namespaces.php +++ b/vendor/composer/autoload_namespaces.php @@ -1,9 +1,9 @@ load_file($str); $this->loadFile($str); } else { @@ -1123,3 +1122,4 @@ function loadFile($file) } } } +