Skip to content

Optimize php_self and use directly the already defined dir_ws_catalog #229

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

Open
acidvertigo wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Optimize php_self and use directly the already defined dir_ws_catalog #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
02d49fe
Use directly the already defined dir_ws_catalog for php self
acidvertigo Sep 9, 2014
ebf2012
Use str_replace instead of substr and strlen to remove the catalog pa…
acidvertigo Sep 9, 2014
419462a
Optimize php_self admin side
acidvertigo Sep 9, 2014
c1a7fd1
Fix typo
acidvertigo Sep 9, 2014
a4efff9
Remove extra space
acidvertigo Sep 9, 2014
7561a2c
Merge pull request #91 from osCommerce/master
acidvertigo Oct 6, 2014
6dcc399
Merge pull request #111 from osCommerce/master
acidvertigo Oct 7, 2014
e4ec5cc
revert commit
acidvertigo Nov 3, 2014
69ed477
Merge pull request #147 from osCommerce/master
acidvertigo Nov 3, 2014
1ef4035
reapply commit
acidvertigo Nov 3, 2014
23ab23a
applyng right commit
acidvertigo Nov 3, 2014
3881e2c
fix wrong commit
acidvertigo Nov 3, 2014
7ec04ee
fix wrong commit
acidvertigo Nov 3, 2014
20cb930
Fix php self catalog side
acidvertigo Nov 6, 2014
d9c9fd5
Revert latest commit
acidvertigo Nov 6, 2014
0fe95c9
Merge pull request #166 from osCommerce/master
acidvertigo Nov 7, 2014
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
2 changes: 1 addition & 1 deletion catalog/admin/includes/application_top.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

// set php_self in the local scope
$req = parse_url($_SERVER['SCRIPT_NAME']);
$PHP_SELF = substr($req['path'], ($request_type == 'SSL') ? strlen(DIR_WS_HTTPS_ADMIN) : strlen(DIR_WS_ADMIN));
$PHP_SELF = str_replace(($request_type == 'SSL') ? DIR_WS_HTTPS_ADMIN : DIR_WS_ADMIN, '', $req['path']);

// Used in the "Backup Manager" to compress backups
define('LOCAL_EXE_GZIP', 'gzip');
Expand Down
2 changes: 1 addition & 1 deletion catalog/includes/application_top.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

// set php_self in the local scope
$req = parse_url($_SERVER['SCRIPT_NAME']);
$PHP_SELF = substr($req['path'], ($request_type == 'NONSSL') ? strlen(DIR_WS_HTTP_CATALOG) : strlen(DIR_WS_HTTPS_CATALOG));
$PHP_SELF = str_replace(DIR_WS_CATALOG, '', $req['path']);

// include the list of project filenames
require('includes/filenames.php');
Expand Down