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.

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

Misc July Updates #201

Closed
wants to merge 11 commits into from
Closed

Misc July Updates #201

wants to merge 11 commits into from

Conversation

cydh
Copy link
Contributor

@cydh cydh commented Jul 10, 2018

✔️ Support for Random Option info in all item listings (inventory, storage, cart, guild storage, vending, buyingstore)
✔️ Added item list view for vending and buyingstore
✔️ Add more filtering on rA Logs Logdata modules
✔️ Moved bound labels to its own file
✔️ Added config for card0 special values. #194 is added here fixes #190
✔️ Added 'Beloved' label for renamed pet egg (in near future will be added Pet data for name look up)

cydh added 10 commits July 10, 2018 16:25
* Added random option info in inventory, cart, and storage. If item has options, it'll show as [n Options] in default theme, collapsible.
* Random option feature can be disabled in application.php for backward compatibility
* Vending & buyingstore have item listing as default, listing by shop name is now in different page: vendors & buyers
* Recolor item price for vending & buyingstore
* Moved item bound message to label
* Added new library Flux/Item to reduce redundant codes after item fetching
* Fixes #190, renewed card0 special values and added into config in application.php for backward compatibility
* Added random option
* Added forged, creation, pet info
* Added filtering
* Added random options, bound info, item special info, unique id view in item picklog
* Added filter for inter logs
* Cleanup date filtering in logdata
* Fixed wrong assignment in `getCardsOver`
* Cleanup `getPriceStyle`
@ghost
Copy link

ghost commented Jul 10, 2018

It's missing js/flux.itemoption.js

@cydh
Copy link
Contributor Author

cydh commented Sep 4, 2018

I will merge this after #210 merged, I need the RespectValidation for validation input in filters

@ghost
Copy link

ghost commented Feb 23, 2019

@cydh This error appears when you see Characters
PHP Warning: A non-numeric value encountered in /lib/Flux/Item.php on line 118

Copy link
Contributor Author

@cydh cydh left a comment

Choose a reason for hiding this comment

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

simply regex check for input validation for this version of flux maybe..


$sql_criteria = "";
$sql_params = array();
if ($refine) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
if ($refine) {
if (preg_match('/^\d+$/', $refine)) {

$sql_criteria .= '`ci`.`refine`=?';
$sql_params[] = $refine;
}
if ($card) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
if ($card) {
if (preg_match('/^\d+$/', $card)) {

$sql_params[] = $card;
$sql_params[] = $card;
}
if ($item) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
if ($item) {
if (preg_match('/^[\w\'\- ]+$/', $item)) {


$sql_criteria = "";
$sql_params = array();
if ($vendor) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
if ($vendor) {
if (preg_match('/^[\w\'\- ]+$/', $vendor)) {

More allowed char name on server?

$sql_criteria .= '`name` LIKE ? ';
$sql_params[] = "%$vendor%";
}
if ($shopname) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
if ($shopname) {
if (preg_match('/^[\w\'\- ]+$/', $shopname)) {

$sql_criteria .= '`title` LIKE ? ';
$sql_params[] = "%$shopname%";
}
if ($map) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
if ($map) {
if (preg_match('/^[\w\-]+$/', $map)) {

@douglasparker
Copy link

Is this ready to be merged?

@Akkarinage Akkarinage marked this pull request as draft March 16, 2024 11:28
@Akkarinage
Copy link
Member

We're not merging monster-sized Pull Requests that affects 57 files for 13 different reasons. If anyone wants to, they can separate out the changes if they're still beneficial to FluxCP as individual PRs.

@Akkarinage Akkarinage closed this Mar 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Outdated card0 checks
3 participants