Skip to content

Fixed some errors with PHP-7 #10

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
mystralkk wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixed some errors with PHP-7 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4cada49
Fixed some errors with PHP-7
mystralkk Mar 17, 2017
3671980
add Japanese language file
ivywe Mar 18, 2017
d2534f3
add {templatelocation} to templates
ivywe Mar 18, 2017
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 admin/icons.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ function MAPS_deleteIconImage ($image)
$msg = $LANG_MAPS_1['deletion_fail'];
}
// delete complete, return to icon list
echo COM_refresh($_CONF['site_url'] . "/admin/plugins/maps/icons.php?msg=$msg");
COM_redirect($_CONF['site_url'] . "/admin/plugins/maps/icons.php?msg=$msg");

exit();
break;;
Expand Down Expand Up @@ -397,7 +397,7 @@ function MAPS_deleteIconImage ($image)
MAPS_saveIconImage($_REQUEST, $_FILES, $id);
}
// save complete, return to icons list
echo COM_refresh($_CONF['site_admin_url'] . "/plugins/maps/icons.php?msg=" . urlencode($msg));
COM_redirect($_CONF['site_admin_url'] . "/plugins/maps/icons.php?msg=" . urlencode($msg));
exit();
break;

Expand Down
3 changes: 1 addition & 2 deletions admin/import_export.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,7 @@ function MAPS_importCSV ($FILES = '', $map_id, $separator=';', $fields, $valid =
if($map_id == '') return MAPS_message('Map ID is missing');

if ( !in_array($separator, array(',','tab',';')) ) {
echo COM_refresh($_CONF['site_admin_url'] . '/plugins/maps/import_export.php');
exit();
COM_redirect($_CONF['site_admin_url'] . '/plugins/maps/import_export.php');
}

if ($valid == false) {
Expand Down
9 changes: 3 additions & 6 deletions admin/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,21 +193,18 @@ function plugin_getListField_maps($fieldname, $fieldvalue, $A, $icon_arr)

//Create a new marker for admin
case 'edit' :
echo COM_refresh($_CONF['site_url'] . "/admin/plugins/maps/marker_edit.php");
exit();
COM_redirect($_CONF['site_url'] . "/admin/plugins/maps/marker_edit.php");
break;

//Edit marker sumission
case 'editsubmission' :
$id = $_REQUEST['id'];
echo COM_refresh($_CONF['site_url'] . "/admin/plugins/maps/marker_edit.php?mode=editsubmission&mkid=$id");
exit();
COM_redirect($_CONF['site_url'] . "/admin/plugins/maps/marker_edit.php?mode=editsubmission&mkid=$id");
break;

case 'setgeolocation' :
MAPS_setGeoLocation();
echo COM_refresh($_CONF['site_url'] . "/admin/plugins/maps/index.php?msg=" . urlencode($LANG_MAPS_1['set_geo_location']));
exit();
COM_redirect($_CONF['site_url'] . "/admin/plugins/maps/index.php?msg=" . urlencode($LANG_MAPS_1['set_geo_location']));
break;

default :
Expand Down
8 changes: 3 additions & 5 deletions admin/map_edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,8 +457,7 @@ function()
$msg = $LANG_MAPS_1['deletion_fail'];
}
// delete complete, return to map list
echo COM_refresh($_CONF['site_url'] . "/admin/plugins/maps/index.php?msg=$msg");
exit();
COM_redirect($_CONF['site_url'] . "/admin/plugins/maps/index.php?msg=$msg");
break;

case 'save':
Expand Down Expand Up @@ -558,8 +557,7 @@ function()
$msg = $LANG_MAPS_1['save_success'];
}
// save complete, return to map list
echo COM_refresh($_CONF['site_admin_url'] . "/plugins/maps/index.php?msg=$msg");
exit();
COM_redirect($_CONF['site_admin_url'] . "/plugins/maps/index.php?msg=$msg");
break;

case 'edit':
Expand All @@ -575,7 +573,7 @@ function()
}
$display .= getMapForm($A);
} else {
echo COM_refresh($_CONF['site_url']);
COM_redirect($_CONF['site_url']);
}
break;

Expand Down
16 changes: 7 additions & 9 deletions admin/marker_edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ function getMarkerForm($marker = array()) {

$_SCRIPTS->setJavaScriptLibrary('jquery');
$_SCRIPTS->setJavaScriptFile('maps_simplecolor', '/' . $_MAPS_CONF['maps_folder'] . '/js/simple-color.js');
$js = LB . '<script type="text/javascript" src= "https://maps.googleapis.com/maps/api/js?key=' . $_MAPS_CONF['google_api_key'] . '&sensor=false"> </script>
$js = LB . '
<script type="text/javascript">
jQuery(document).ready(
function()
Expand Down Expand Up @@ -579,9 +579,9 @@ function copyText()
$msg = $LANG_MAPS_1['deletion_fail'];
}
// delete complete, return to map list
echo COM_refresh($_CONF['site_url'] . "/admin/plugins/maps/markers.php?msg=$msg");
COM_redirect($_CONF['site_url'] . "/admin/plugins/maps/markers.php?msg=$msg");
} else {
echo COM_refresh($_CONF['site_url'] . "/admin/moderation.php");
COM_redirect($_CONF['site_url'] . "/admin/moderation.php");
}
exit();
break;
Expand Down Expand Up @@ -771,8 +771,7 @@ function copyText()
DB_delete($_TABLES['maps_submission'], 'mkid', $mkid);
}
// save complete, return to markers list
echo COM_refresh($_CONF['site_admin_url'] . "/plugins/maps/markers.php?msg=" . urlencode($msg));
exit();
COM_redirect($_CONF['site_admin_url'] . "/plugins/maps/markers.php?msg=" . urlencode($msg));
break;

/* this case is currently not used... future expansion? */
Expand All @@ -788,7 +787,7 @@ function copyText()
$A = DB_fetchArray($res);
$display .= getMarkerForm($A);
} else {
echo COM_refresh($_CONF['site_url']);
COM_redirect($_CONF['site_url']);
}
break;

Expand All @@ -800,14 +799,13 @@ function copyText()

$nRows = DB_numRows($res);
if ($nRows < 1) {
//echo COM_refresh($_MAPS_CONF['site_url'] . '/index.php');
//exit ();
//COM_redirect($_MAPS_CONF['site_url'] . '/index.php');
}

$A = DB_fetchArray($res);
$display .= getMarkerForm($A);
} else {
echo COM_refresh($_CONF['site_url']);
COM_redirect($_CONF['site_url']);
}
break;

Expand Down
9 changes: 3 additions & 6 deletions admin/overlay_edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,9 +316,7 @@ function MAPS_selectGroupOverlays ($selected)
$msg = $LANG_MAPS_1['deletion_fail'];
}
// delete complete, return to map list
echo COM_refresh($_CONF['site_url'] . "/admin/plugins/maps/overlays.php?msg=$msg");

exit();
COM_redirect($_CONF['site_url'] . "/admin/plugins/maps/overlays.php?msg=$msg");
break;

case 'save':
Expand Down Expand Up @@ -366,8 +364,7 @@ function MAPS_selectGroupOverlays ($selected)
MAPS_saveOverlayImage($_REQUEST, $_FILES, $oid);
}
// save complete, return to overlays list
echo COM_refresh($_CONF['site_admin_url'] . "/plugins/maps/overlays.php?msg=" . urlencode($msg));
exit();
COM_redirect($_CONF['site_admin_url'] . "/plugins/maps/overlays.php?msg=" . urlencode($msg));
break;

case 'edit':
Expand All @@ -378,7 +375,7 @@ function MAPS_selectGroupOverlays ($selected)
$A = DB_fetchArray($res);
$display .= MAPS_getOverlayForm($A);
} else {
echo COM_refresh($_CONF['site_url']);
COM_redirect($_CONF['site_url']);
}
break;

Expand Down
7 changes: 3 additions & 4 deletions admin/overlay_group_edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ function MAPS_getGroupOverlayForm($group = array()) {
$msg = $LANG_MAPS_1['deletion_fail'];
}
// delete complete, return to map list
echo COM_refresh($_CONF['site_url'] . "/admin/plugins/maps/overlays.php?mode=groups&amp;msg=$msg");
COM_redirect($_CONF['site_url'] . "/admin/plugins/maps/overlays.php?mode=groups&amp;msg=$msg");

exit();
break;
Expand Down Expand Up @@ -164,8 +164,7 @@ function MAPS_getGroupOverlayForm($group = array()) {
}

// save complete, return to overlays list
echo COM_refresh($_CONF['site_admin_url'] . "/plugins/maps/overlays.php?mode=groups&amp;msg=" . urlencode($msg));
exit();
COM_redirect($_CONF['site_admin_url'] . "/plugins/maps/overlays.php?mode=groups&amp;msg=" . urlencode($msg));
break;

case 'edit':
Expand All @@ -176,7 +175,7 @@ function MAPS_getGroupOverlayForm($group = array()) {
$A = DB_fetchArray($res);
$display .= MAPS_getGroupOverlayForm($A);
} else {
echo COM_refresh($_CONF['site_url']);
COM_redirect($_CONF['site_url']);
}
break;

Expand Down
Loading