Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Strip last of geodesicsolutions.com #152

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Strip last of geodesicsolutions.com #152

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
53212d8
Strip last of geodesicsolutions.com
vicos59 Mar 8, 2022
e8b3a0c
change sample URLs to example.com
vicos59 Mar 9, 2022
0898455
Change example.org to example.com
vicos59 Mar 9, 2022
f6718d4
Update data_misc.sql
vicos59 Mar 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/sql/data_misc.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1115,7 +1115,7 @@ INSERT INTO `geodesic_classifieds_ad_configuration` (`number_of_photos_in_detail
-- WARNING: If this table is altered or removed, UPDATE TRIAL BUILDER!

INSERT INTO `geodesic_classifieds_configuration` (`classifieds_url`, `classifieds_file_name`, `classifieds_ssl_url`, `affiliate_url`, `use_ssl_in_sell_process`, `site_name`, `title_bar_description`, `site_backup_dir`, `width_of_pages`, `site_page_align`, `minimum_page_height`, `font_type`, `send_register_attempt_email_admin`, `secret_for_hash`, `use_email_verification_at_registration`, `admin_approves_all_registration`, `registration_url`, `registration_ssl_url`, `use_ssl_in_registration`, `additional_shipping_charge`, `use_company_name_field`, `use_phone_field`, `use_phone2_field`, `use_fax_field`, `use_url_field`, `use_business_type_field`, `use_user_agreement_field`, `require_company_name_field`, `require_business_type`, `require_phone_field`, `require_phone2_field`, `require_fax_field`, `require_url_field`, `number_of_browsing_columns`, `number_of_browsing_subcategory_columns`, `display_category_description`, `display_no_subcategory_message`, `display_ad_description_where`, `row_color1`, `row_color2`, `row_color_black`, `photo_icon_url`, `display_sub_category_ads`, `display_category_count`, `browsing_count_format`, `length_of_description`, `display_all_of_description`, `number_of_ads_to_display`, `max_word_width`, `footer_powered_by_link`, `help_image`, `sold_image`, `use_featured_feature`, `use_featured_feature_2`, `use_featured_feature_3`, `use_featured_feature_4`, `use_featured_feature_5`, `use_bolding_feature`, `use_better_placement_feature`, `use_attention_getters`, `all_ads_are_free`, `all_requests_are_free`, `expire_unfinished_period`, `charge_tax_by`, `default_tax_rate`, `paypal_id`, `paypal_currency_rate`, `paypal_currency`, `precurrency`, `postcurrency`, `payment_waiting_period`, `photo_or_icon`, `thumbnail_max_height`, `thumbnail_max_width`, `featured_ad_count`, `number_of_new_ads_to_display`, `show_country_dropdown`, `show_state_dropdown`, `days_can_upgrade`, `upgrade_time`, `days_to_renew`, `featured_pic_ad_column_count`, `featured_ad_page_count`, `use_category_cache`, `category_cache_time`, `send_successful_placement_email`, `number_of_sellers_to_display`, `display_sub_category_sellers`, `voting_system`, `number_of_vote_comments_to_display`, `post_login_page`, `category_tree_display`, `place_ads_only_in_terminal_categories`, `entry_date_configuration`, `number_of_featured_ads_to_display`, `featured_thumbnail_max_height`, `featured_thumbnail_max_width`, `image_link_destination_type`, `display_category_tree`, `display_category_navigation`, `admin_approves_all_ads`, `subscription_expire_period_notice`, `use_rte`, `email_configuration_type`, `levels_of_categories_displayed`, `use_zip_distance_calculator`, `use_api`, `use_search_form`, `order_choose_category_by_alpha`, `popup_while_browsing`, `popup_while_browsing_width`, `popup_while_browsing_height`, `paypal_image_url`, `paypal_item_label`, `seller_contact`, `admin_email_edit`, `category_new_ad_limit`, `category_new_ad_image`, `password_key`, `use_css`, `user_set_hold_email`, `use_account_balance`, `positive_balances_only`, `maximum_print_description_length`, `no_image_url`, `home_template`, `invoice_cutoff`, `send_admin_placement_email`, `send_admin_end_email`, `subscription_to_view_or_bid_ads`, `site_balance_override`, `idevaffiliate`, `idev_renewal`, `idev_upgrade`, `idev_path`, `sell_category_column_count`, `levels_of_categories_displayed_admin`, `checkbox_columns`, `charset`, `email_salutation_type`, `debug_admin`, `debug_browse`, `debug_register`, `debug_feedback`, `debug_user_management`, `debug_images`, `debug_sell`, `debug_site`, `debug_affiliate`, `debug_renew`, `debug_bid`, `debug_authenticate`, `debug_modules`, `user_set_auction_end_times`, `user_set_auction_start_times`, `display_before_start`, `auction_extension_check`, `auction_extension`, `black_list_of_buyers`, `invited_list_of_buyers`, `title_module_text`, `buy_now_image`, `reserve_met_image`, `allow_standard`, `allow_dutch`, `no_reserve_image`, `buy_now_reserve`, `edit_begin`, `admin_only_removes_auctions`, `number_format`, `edit_reset_date`, `bid_history_link_live`, `site_on_off`, `disable_site_url`, `time_shift`, `listing_type_allowed`, `url_rewrite`, `optional_field_1_name`, `optional_field_2_name`, `optional_field_3_name`, `optional_field_4_name`, `optional_field_5_name`, `optional_field_6_name`, `optional_field_7_name`, `optional_field_8_name`, `optional_field_9_name`, `optional_field_10_name`, `optional_field_11_name`, `optional_field_12_name`, `optional_field_13_name`, `optional_field_14_name`, `optional_field_15_name`, `optional_field_16_name`, `optional_field_17_name`, `optional_field_18_name`, `optional_field_19_name`, `optional_field_20_name`, `default_display_order_while_browsing`, `ip_ban_check`, `number_of_feedbacks_to_display`, `display_storefront_link`, `storefront_url`, `member_since_date_configuration`, `popup_image_while_browsing`) VALUES
('http://www.MyListingsSite.com/index.php', 'index.php', '', 'http://www.MyListingsSite.com/aff.php', 0, 'GeoClassifieds Enterprise', 'Nothing bigger or better', '', 760, 'center', 0, '', 0, 'shorterthan20', 0, 0, 'http://www.MyListingsSite.com/register.php', '', 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 3, 4, 1, 0, 1, 'ffff80', 'ffffff', '000066', 'images/misc/photo_icon2.gif', 1, 1, 3, 20, 0, 40, 50, 0, 'images%2Fmisc%2Fquestion_mark.gif', 'images/misc/attn_gtr_sold2.gif', 1, 0, 0, 0, 0, 1, 1, 1, 0, 0, 30, 1, 0.00, 'paypal@geodesicsolutions.com', 0.0000, '', '$', 'US', 30, 1, 150, 150, 6, 0, 0, 0, 29, 0, 15, 5, 15, 0, 0, 0, 0, 0, 2, 10, 0, 1, 0, 'M j, Y, G:i:s', 5, 150, 150, 0, 1, 1, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, '', '', 0, 0, 120, 'images/misc/new_ad.gif', '', 1, 0, 1, 0, 1000, 'images/misc/nophoto.gif', 119, 0, 0, 0, 0, 0, 0, 0, 0, '', 3, 5, 4, 'utf-8', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, '', 'images/misc/buynow2.gif', 'images/misc/resmet.gif', 1, 1, 'images/misc/nores.gif', 0, 0, 0, 0, 0, 1, 0, 'site_off.htm', 0, 0, 0, 'Optional Field 1', 'Optional Field 2', 'Optional Field 3', 'Optional Field 4', 'Optional Field 5', 'Optional Field 6', 'Optional Field 7', 'Optional Field 8', 'Optional Field 9', 'Optional Field 10', 'Optional Field 11', 'Optional Field 12', 'Optional Field 13', 'Optional Field 14', 'VIN', 'Optional Field 16', 'Optional Field 17', 'Optional Field 18', 'Optional Field 19', 'Shipping & Handling', -1, 0, 1, 0, 'http://www.MyListingsSite.com/stores.php', 'M j, Y', 0);
('http://www.MyListingsSite.com/index.php', 'index.php', '', 'http://www.MyListingsSite.com/aff.php', 0, 'GeoClassifieds Enterprise', 'Nothing bigger or better', '', 760, 'center', 0, '', 0, 'shorterthan20', 0, 0, 'http://www.MyListingsSite.com/register.php', '', 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 3, 4, 1, 0, 1, 'ffff80', 'ffffff', '000066', 'images/misc/photo_icon2.gif', 1, 1, 3, 20, 0, 40, 50, 0, 'images%2Fmisc%2Fquestion_mark.gif', 'images/misc/attn_gtr_sold2.gif', 1, 0, 0, 0, 0, 1, 1, 1, 0, 0, 30, 1, 0.00, 'paypal@geodesicsolutions.org', 0.0000, '', '$', 'US', 30, 1, 150, 150, 6, 0, 0, 0, 29, 0, 15, 5, 15, 0, 0, 0, 0, 0, 2, 10, 0, 1, 0, 'M j, Y, G:i:s', 5, 150, 150, 0, 1, 1, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, '', '', 0, 0, 120, 'images/misc/new_ad.gif', '', 1, 0, 1, 0, 1000, 'images/misc/nophoto.gif', 119, 0, 0, 0, 0, 0, 0, 0, 0, '', 3, 5, 4, 'utf-8', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, '', 'images/misc/buynow2.gif', 'images/misc/resmet.gif', 1, 1, 'images/misc/nores.gif', 0, 0, 0, 0, 0, 1, 0, 'site_off.htm', 0, 0, 0, 'Optional Field 1', 'Optional Field 2', 'Optional Field 3', 'Optional Field 4', 'Optional Field 5', 'Optional Field 6', 'Optional Field 7', 'Optional Field 8', 'Optional Field 9', 'Optional Field 10', 'Optional Field 11', 'Optional Field 12', 'Optional Field 13', 'Optional Field 14', 'VIN', 'Optional Field 16', 'Optional Field 17', 'Optional Field 18', 'Optional Field 19', 'Shipping & Handling', -1, 0, 1, 0, 'http://www.MyListingsSite.com/stores.php', 'M j, Y', 0);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of paypal@geodesicsolutions.org, lets make it something that is clear it would never work - paypal@example.com.

example.com is a good one for documentation and the like, it is a reserved domain specifically for use in documentation and the like. And it could never be used for a real paypal address since you need to verify your email when signing up with paypal.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

did you do a test run through the setup/

Other than installing site from scratch, is there a better way to test it? Are you mainly concerned that the SQL executes w/o error? If so, I could just source the sql file on the database.


--
-- Dumping data for table `geodesic_classifieds_price_increments`
Expand Down Expand Up @@ -3138,7 +3138,7 @@ INSERT INTO `geodesic_site_settings` (`setting`, `value`) VALUES
--

INSERT INTO `geodesic_userdata` (`id`, `username`, `email`, `email2`, `newsletter`, `level`, `company_name`, `business_type`, `firstname`, `lastname`, `address`, `address_2`, `zip`, `city`, `state`, `country`, `phone`, `phone2`, `fax`, `url`, `date_joined`, `communication_type`, `feedback_score`, `feedback_count`, `feedback_positive_count`, `rate_sum`, `rate_num`, `optional_field_1`, `optional_field_2`, `optional_field_3`, `optional_field_4`, `optional_field_5`, `optional_field_6`, `optional_field_7`, `optional_field_8`, `optional_field_9`, `optional_field_10`, `affiliate_html`, `filter_id`, `expose_email`, `expose_company_name`, `expose_firstname`, `expose_lastname`, `expose_address`, `expose_city`, `expose_state`, `expose_country`, `expose_zip`, `expose_phone`, `expose_phone2`, `expose_fax`, `expose_url`, `expose_optional_1`, `expose_optional_2`, `expose_optional_3`, `expose_optional_4`, `expose_optional_5`, `expose_optional_6`, `expose_optional_7`, `expose_optional_8`, `expose_optional_9`, `expose_optional_10`, `account_balance`, `date_balance_negative`, `balance_freeze`, `feedback_icon`, `storefront_header`, `storefront_template_id`, `storefront_welcome_message`, `storefront_on_hold`, `storefront_home_link`, `storefront_traffic_processed_at`, `last_login_time`, `last_login_ip`, `verified`, `storefront_trials_used`) VALUES
(1, 'admin', 'geoproducts@geodesicsolutions.com', '', 0, 1, 'Geodesic Solutions', 0, 'admin', 'admin', 'address', '', 'zipcode', 'city', 'state', 'country', 'phone', '', 'fax', '', 0, 3, 0, 0, 0, 0, 0, '', '', '', '', '', '', '', '', '', '', '', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.0000, 0, 0, '', '', 0, '', 1, '', 1164053097, '2006-11-21 17:53:07', '192.168.1.124', 'no', '');
(1, 'admin', 'fake@geodesicsolutions.org', '', 0, 1, 'Geodesic Solutions', 0, 'admin', 'admin', 'address', '', 'zipcode', 'city', 'state', 'country', 'phone', '', 'fax', '', 0, 3, 0, 0, 0, 0, 0, '', '', '', '', '', '', '', '', '', '', '', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.0000, 0, 0, '', '', 0, '', 1, '', 1164053097, '2006-11-21 17:53:07', '192.168.1.124', 'no', '');

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here, if the URL default serves no real purpose, use example.com. So in this case since it is for the default admin email, use admin@example.com.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I seem to recall that there are also phony links in there that should also use example.com

www.MyListingsSite.com

--
-- Dumping data for table `geodesic_user_groups_price_plans`
Expand Down
6 changes: 3 additions & 3 deletions src/upgrade/versions/3.1_to_4.0/conditional_sql.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@
$check = $this->_db->GetRow("SELECT `question_id` FROM `geodesic_classifieds_sell_questions_languages` WHERE `question_id`={$row['question_id']} AND `language_id`=$lang_id");
if (!$check) {
//insert into languages table.
$sql_strict[] = "INSERT INTO `geodesic_classifieds_sell_questions_languages` (`question_id`, `language_id`, `name`, `explanation`, `choices`)
VALUES ({$row['question_id']}, $lang_id, " . $this->_db->qstr($row['name'] . '') . ",
$sql_strict[] = "INSERT INTO `geodesic_classifieds_sell_questions_languages` (`question_id`, `language_id`, `name`, `explanation`, `choices`)
VALUES ({$row['question_id']}, $lang_id, " . $this->_db->qstr($row['name'] . '') . ",
" . $this->_db->qstr($row['explanation'] . '') . ", " . $this->_db->qstr($row['choices'] . '') . ")";
} else {
//to keep sql count the same, so resume upgrade works properly
Expand Down Expand Up @@ -528,7 +528,7 @@

$sql = "select `paypal_id`, `paypal_currency_rate`, `paypal_currency`, `paypal_image_url`, `paypal_item_label` from `geodesic_classifieds_configuration`";
$result = $this->_db->GetRow($sql);
if ($result && strlen($result['paypal_id']) > 0 && $result['paypal_id'] != 'paypal@geodesicsolutions.com') {
if ($result && strlen($result['paypal_id']) > 0 && $result['paypal_id'] != 'paypal@geodesicsolutions.org') {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Of course whatever you change it to remember to update this spot to match.

$paypal_data['paypal_id'] = $this->_db->qstr('' . $result['paypal_id']);
$paypal_data['paypal_currency_rate'] = $this->_db->qstr('' . $result['paypal_currency_rate']);
$paypal_data['paypal_currency_type'] = $this->_db->qstr('' . $result['paypal_currency']);
Expand Down
1 change: 0 additions & 1 deletion src/upgrade/versions/pre_2.0.10/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3340,7 +3340,6 @@ function showNotes()
<p class="failed" style="text-align:left; font-weight:normal;"><br><br>Be sure to read the update instructions in the <a href="https://geodesicsolutions.org/wiki/update/start" target="_blank">user manual</a>, for important additional steps after the upgrade wizard is finished.</p>
<span style="text-align: left;"><?php echo $upgrade->body; ?></span>
</div>
<div id="login_copyright">Copyright 2001-2011. <a class="login_link" href="http://geodesicsolutions.com" onclick="window.open(this.href); return false;">Geodesic Solutions, LLC.</a><br />All Rights Reserved.</div>
</div>
<div style="clear: both;"></div>
</div>
Expand Down