Skip to content

Commit 2defdd7

Browse files
author
Emmanuel Garette
committed
reindent
1 parent ff7d8c0 commit 2defdd7

1 file changed

Lines changed: 108 additions & 107 deletions

File tree

‎admin/admin_config.php‎

Lines changed: 108 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -37,75 +37,75 @@
3737

3838
// Available baselayer
3939
$available_baselayer = array(
40-
'mapnik' => 'OpenStreetMap Mapnik',
41-
'blackandwhite' => 'OpenStreetMap BlackAndWhite',
42-
'mapnikfr' => 'OpenStreetMap FR',
43-
'mapnikde' => 'OpenStreetMap DE',
44-
'mapnikhot' => 'OpenStreetMap HOT',
45-
'mapquest' => 'MapQuestOpen',
46-
'mapquestaerial' => 'MapQuestOpen Aerial',
47-
'cloudmade' => 'Cloudmade',
48-
'custom' => 'custom',
40+
'mapnik' => 'OpenStreetMap Mapnik',
41+
'blackandwhite' => 'OpenStreetMap BlackAndWhite',
42+
'mapnikfr' => 'OpenStreetMap FR',
43+
'mapnikde' => 'OpenStreetMap DE',
44+
'mapnikhot' => 'OpenStreetMap HOT',
45+
'mapquest' => 'MapQuestOpen',
46+
'mapquestaerial' => 'MapQuestOpen Aerial',
47+
'cloudmade' => 'Cloudmade',
48+
'custom' => 'custom',
4949
);
5050

5151
// Available zoom value
5252
$available_zoom = array(
53-
'1' => '1',
54-
'2' => '2',
55-
'3' => '3',
56-
'4' => '4',
57-
'5' => '5',
58-
'6' => '6',
59-
'7' => '7',
60-
'8' => '8',
61-
'9' => '9',
62-
'10' => '10',
63-
'11' => '11',
64-
'12' => '12',
65-
'13' => '13',
66-
'14' => '14',
67-
'15' => '15',
68-
'16' => '16',
69-
'17' => '17',
70-
'18' => '18',
53+
'1' => '1',
54+
'2' => '2',
55+
'3' => '3',
56+
'4' => '4',
57+
'5' => '5',
58+
'6' => '6',
59+
'7' => '7',
60+
'8' => '8',
61+
'9' => '9',
62+
'10' => '10',
63+
'11' => '11',
64+
'12' => '12',
65+
'13' => '13',
66+
'14' => '14',
67+
'15' => '15',
68+
'16' => '16',
69+
'17' => '17',
70+
'18' => '18',
7171
);
7272

7373
// Available options
7474
$available_add_before = array(
75-
'Author' => l10n('Author'),
76-
'datecreate' => l10n('Created on'),
77-
'datepost' => l10n('Posted on'),
78-
'Dimensions' => l10n('Dimensions'),
79-
'File' => l10n('File'),
80-
'Filesize' => l10n('Filesize'),
81-
'Tags' => l10n('Tags'),
82-
'Categories' => l10n('Albums'),
83-
'Visits' => l10n('Visits'),
84-
'Average' => l10n('Rating score'),
85-
'rating' => l10n('Rate this photo'),
86-
'Privacy' => l10n('Who can see this photo?'),
75+
'Author' => l10n('Author'),
76+
'datecreate' => l10n('Created on'),
77+
'datepost' => l10n('Posted on'),
78+
'Dimensions' => l10n('Dimensions'),
79+
'File' => l10n('File'),
80+
'Filesize' => l10n('Filesize'),
81+
'Tags' => l10n('Tags'),
82+
'Categories' => l10n('Albums'),
83+
'Visits' => l10n('Visits'),
84+
'Average' => l10n('Rating score'),
85+
'rating' => l10n('Rate this photo'),
86+
'Privacy' => l10n('Who can see this photo?'),
8787
);
8888

8989
// Available pin
9090
$available_pin = array(
91-
'0' => l10n('NOPIN'),
92-
'1' => l10n('DEFAULTPIN'),
93-
'2' => l10n('DEFAULTPINGREEN'),
94-
'3' => l10n('DEFAULTPINRED'),
95-
'4' => l10n('LEAFPINGREEN'),
96-
'5' => l10n('LEAFPINORANGE'),
97-
'6' => l10n('LEAFPINRED'),
98-
'7' => l10n('MAPICONSBLEU'),
99-
'8' => l10n('MAPICONSGREEN'),
100-
'9' => l10n('OWNPIN'),
101-
'10' => l10n('IMAGE'),
91+
'0' => l10n('NOPIN'),
92+
'1' => l10n('DEFAULTPIN'),
93+
'2' => l10n('DEFAULTPINGREEN'),
94+
'3' => l10n('DEFAULTPINRED'),
95+
'4' => l10n('LEAFPINGREEN'),
96+
'5' => l10n('LEAFPINORANGE'),
97+
'6' => l10n('LEAFPINRED'),
98+
'7' => l10n('MAPICONSBLEU'),
99+
'8' => l10n('MAPICONSGREEN'),
100+
'9' => l10n('OWNPIN'),
101+
'10' => l10n('IMAGE'),
102102
);
103103

104104
// Available popup
105105
$available_popup = array(
106-
'0' => l10n('CLICK'),
107-
// '1' => l10n('ALWAYS'),
108-
'2' => l10n('NEVER'),
106+
'0' => l10n('CLICK'),
107+
// '1' => l10n('ALWAYS'),
108+
'2' => l10n('NEVER'),
109109
);
110110

111111
$query = 'SELECT COUNT(*) FROM '.IMAGES_TABLE.' WHERE `latitude` IS NOT NULL and `longitude` IS NOT NULL ';
@@ -114,67 +114,68 @@
114114
// Update conf if submitted in admin site
115115
if (isset($_POST['submit']) && !empty($_POST['osm_height']))
116116
{
117-
// On post admin form
118-
$conf['osm_conf'] = array(
119-
'right_panel' => array(
120-
'enabled' => get_boolean($_POST['osm_right_panel']),
121-
'add_before' => $_POST['osm_add_before'],
122-
'height' => $_POST['osm_height'],
123-
'zoom' => $_POST['osm_zoom'],
124-
'link' => $_POST['osm_right_link'],
125-
'linkcss' => $_POST['osm_right_linkcss'],
126-
'showosm' => get_boolean($_POST['osm_showosm']),
127-
),
128-
'left_menu' => array(
129-
'enabled' => get_boolean($_POST['osm_left_menu']),
130-
'link' => $_POST['osm_left_link'],
131-
'popup' => $_POST['osm_left_popup'],
132-
'popupinfo_name' => isset($_POST['osm_left_popupinfo_name']),
133-
'popupinfo_img' => isset($_POST['osm_left_popupinfo_img']),
134-
'popupinfo_link' => isset($_POST['osm_left_popupinfo_link']),
135-
'popupinfo_comment' => isset($_POST['osm_left_popupinfo_comment']),
136-
'popupinfo_author' => isset($_POST['osm_left_popupinfo_author']),
137-
),
138-
'map' => array(
139-
'baselayer' => $_POST['osm_baselayer'],
140-
'custombaselayer' => $_POST['osm_custombaselayer'],
141-
'custombaselayerurl' => $_POST['osm_custombaselayerurl'],
142-
'noworldwarp' => get_boolean($_POST['osm_noworldwarp']),
143-
'attrleaflet' => get_boolean($_POST['osm_attrleaflet']),
144-
'attrimagery' => get_boolean($_POST['osm_attrimagery']),
145-
'attrplugin' => get_boolean($_POST['osm_attrplugin']),
146-
),
147-
'pin' => array(
148-
'pin' => $_POST['osm_pin'],
149-
'pinpath' => $_POST['osm_pinpath'],
150-
'pinsize' => $_POST['osm_pinsize'],
151-
'pinshadowpath' => $_POST['osm_pinshadowpath'],
152-
'pinshadowsize' => $_POST['osm_pinshadowsize'],
153-
'pinoffset' => $_POST['osm_pinoffset'],
154-
'pinpopupoffset' => $_POST['osm_pinpopupoffset'],
155-
),
156-
);
117+
// On post admin form
118+
$conf['osm_conf'] = array(
119+
'right_panel' => array(
120+
'enabled' => get_boolean($_POST['osm_right_panel']),
121+
'add_before' => $_POST['osm_add_before'],
122+
'height' => $_POST['osm_height'],
123+
'zoom' => $_POST['osm_zoom'],
124+
'link' => $_POST['osm_right_link'],
125+
'linkcss' => $_POST['osm_right_linkcss'],
126+
'showosm' => get_boolean($_POST['osm_showosm']),
127+
),
128+
'left_menu' => array(
129+
'enabled' => get_boolean($_POST['osm_left_menu']),
130+
'link' => $_POST['osm_left_link'],
131+
'popup' => $_POST['osm_left_popup'],
132+
'popupinfo_name' => isset($_POST['osm_left_popupinfo_name']),
133+
'popupinfo_img' => isset($_POST['osm_left_popupinfo_img']),
134+
'popupinfo_link' => isset($_POST['osm_left_popupinfo_link']),
135+
'popupinfo_comment' => isset($_POST['osm_left_popupinfo_comment']),
136+
'popupinfo_author' => isset($_POST['osm_left_popupinfo_author']),
137+
),
138+
'map' => array(
139+
'baselayer' => $_POST['osm_baselayer'],
140+
'custombaselayer' => $_POST['osm_custombaselayer'],
141+
'custombaselayerurl' => $_POST['osm_custombaselayerurl'],
142+
'noworldwarp' => get_boolean($_POST['osm_noworldwarp']),
143+
'attrleaflet' => get_boolean($_POST['osm_attrleaflet']),
144+
'attrimagery' => get_boolean($_POST['osm_attrimagery']),
145+
'attrplugin' => get_boolean($_POST['osm_attrplugin']),
146+
),
147+
'pin' => array(
148+
'pin' => $_POST['osm_pin'],
149+
'pinpath' => $_POST['osm_pinpath'],
150+
'pinsize' => $_POST['osm_pinsize'],
151+
'pinshadowpath' => $_POST['osm_pinshadowpath'],
152+
'pinshadowsize' => $_POST['osm_pinshadowsize'],
153+
'pinoffset' => $_POST['osm_pinoffset'],
154+
'pinpopupoffset' => $_POST['osm_pinpopupoffset'],
155+
),
156+
157+
);
157158

158-
// Update config to DB
159-
conf_update_param('osm_conf', serialize($conf['osm_conf']));
159+
// Update config to DB
160+
conf_update_param('osm_conf', serialize($conf['osm_conf']));
160161

161-
// the prefilter changes, we must delete compiled templatess
162-
$template->delete_compiled_templates();
163-
array_push($page['infos'], l10n('Your configuration settings are saved'));
162+
// the prefilter changes, we must delete compiled templatess
163+
$template->delete_compiled_templates();
164+
array_push($page['infos'], l10n('Your configuration settings are saved'));
164165
}
165166

166167
// send value to template
167168
$template->assign($conf['osm_conf']);
168169
$template->assign(
169-
array(
170-
'AVAILABLE_ADD_BEFORE' => $available_add_before,
171-
'AVAILABLE_ZOOM' => $available_zoom,
172-
'AVAILABLE_BASELAYER' => $available_baselayer,
173-
'AVAILABLE_PIN' => $available_pin,
174-
'AVAILABLE_POPUP' => $available_popup,
175-
'NB_GEOTAGGED' => $nb_geotagged,
176-
'OSM_PATH' => OSM_PATH,
177-
)
170+
array(
171+
'AVAILABLE_ADD_BEFORE' => $available_add_before,
172+
'AVAILABLE_ZOOM' => $available_zoom,
173+
'AVAILABLE_BASELAYER' => $available_baselayer,
174+
'AVAILABLE_PIN' => $available_pin,
175+
'AVAILABLE_POPUP' => $available_popup,
176+
'NB_GEOTAGGED' => $nb_geotagged,
177+
'OSM_PATH' => OSM_PATH,
178+
)
178179
);
179180

180181
?>

0 commit comments

Comments
 (0)