@@ -11,25 +11,25 @@ discard block |
||
11 | 11 | |
12 | 12 | $lang['l_day'] = 'Tag'; |
13 | 13 | $lang['l_week'] = 'Woche'; |
14 | -$lang['l_month'] = 'Monat'; |
|
14 | +$lang['l_month'] = 'Monat'; |
|
15 | 15 | $lang['l_year'] = 'Jahr'; |
16 | 16 | $lang['l_calendar'] = 'Kalender'; |
17 | 17 | $lang['l_next_day'] = 'Folgender Tag'; |
18 | -$lang['l_next_month'] = 'Folgender Monat'; |
|
18 | +$lang['l_next_month'] = 'Folgender Monat'; |
|
19 | 19 | $lang['l_next_week'] = 'Folgende Woche'; |
20 | 20 | $lang['l_next_year'] = 'Folgendes Jahr'; |
21 | -$lang['l_last_day'] = 'Vorheriger Tag'; |
|
22 | -$lang['l_last_month'] = 'Vorheriger Monat'; |
|
21 | +$lang['l_last_day'] = 'Vorheriger Tag'; |
|
22 | +$lang['l_last_month'] = 'Vorheriger Monat'; |
|
23 | 23 | $lang['l_last_week'] = 'Vorherige Woche'; |
24 | 24 | $lang['l_last_year'] = 'Vorheriges Jahr'; |
25 | 25 | $lang['l_subscribe'] = 'Abbonieren'; |
26 | -$lang['l_download'] = 'Herunterladen'; |
|
27 | -$lang['l_powered_by'] = 'Powered by'; |
|
28 | -$lang['l_event'] = 'Eintrag'; |
|
26 | +$lang['l_download'] = 'Herunterladen'; |
|
27 | +$lang['l_powered_by'] = 'Powered by'; |
|
28 | +$lang['l_event'] = 'Eintrag'; |
|
29 | 29 | $lang['l_event_start'] = 'Beginn'; |
30 | -$lang['l_event_end'] = 'Ende'; |
|
30 | +$lang['l_event_end'] = 'Ende'; |
|
31 | 31 | $lang['l_this_months'] = 'Einträge in diesem Monat'; |
32 | -$lang['l_date'] = 'Datum'; |
|
32 | +$lang['l_date'] = 'Datum'; |
|
33 | 33 | $lang['l_summary'] = 'Beschreibung'; |
34 | 34 | $lang['l_all_day'] = 'Tagesereignis'; |
35 | 35 | $lang['l_notes'] = 'Notiz'; |
@@ -37,56 +37,56 @@ discard block |
||
37 | 37 | $lang['l_today'] = 'Heute'; |
38 | 38 | $lang['l_this_week'] = 'Diese Woche'; |
39 | 39 | $lang['l_this_month'] = 'Diesen Monat'; |
40 | -$lang['l_jump'] = 'Gehe zu'; |
|
40 | +$lang['l_jump'] = 'Gehe zu'; |
|
41 | 41 | $lang['l_tomorrows'] = 'Morgige Einträge'; |
42 | -$lang['l_goday'] = 'Gehe zum heutigen Tag'; |
|
42 | +$lang['l_goday'] = 'Gehe zum heutigen Tag'; |
|
43 | 43 | $lang['l_goweek'] = 'Gehe zur aktuellen Woche'; |
44 | 44 | $lang['l_gomonth'] = 'Gehe zum aktuellen Monat'; |
45 | 45 | $lang['l_goyear'] = 'Gehe zum aktuellen Jahr'; |
46 | 46 | $lang['l_search'] = 'Suchen'; // the verb |
47 | 47 | $lang['l_results'] = 'Suchergebnisse'; |
48 | -$lang['l_pick_multiple'] = 'Mehrfachauswahl'; |
|
49 | -$lang['l_query'] = 'Suche'; // will be followed by the search query |
|
50 | -$lang['l_no_results'] = 'Keine Einträge gefunden'; |
|
48 | +$lang['l_pick_multiple'] = 'Mehrfachauswahl'; |
|
49 | +$lang['l_query'] = 'Suche'; // will be followed by the search query |
|
50 | +$lang['l_no_results'] = 'Keine Einträge gefunden'; |
|
51 | 51 | $lang['l_goprint'] = 'Druckversion'; |
52 | -$lang['l_time'] = 'Zeit'; |
|
52 | +$lang['l_time'] = 'Zeit'; |
|
53 | 53 | $lang['l_summary'] = 'Zusammenfassung'; |
54 | 54 | $lang['l_description'] = 'Beschreibung'; |
55 | 55 | $lang['l_this_site_is'] = 'Diese Site ist'; |
56 | 56 | $lang['l_no_events_day'] = 'Keine Einträge für heute.'; |
57 | 57 | $lang['l_no_events_week'] = 'Keine Einträge in dieser Woche.'; |
58 | 58 | $lang['l_no_events_month'] = 'Keine Einträge in diesem Monat.'; |
59 | -$lang['l_rss_day_date'] = 'H:i'; // Lists just the time |
|
60 | -$lang['l_rss_week_date '] = '%e. %b'; // Lists just the day |
|
61 | -$lang['l_rss_month_date '] = '%e. %b'; // Lists just the day |
|
59 | +$lang['l_rss_day_date'] = 'H:i'; // Lists just the time |
|
60 | +$lang['l_rss_week_date '] = '%e. %b'; // Lists just the day |
|
61 | +$lang['l_rss_month_date '] = '%e. %b'; // Lists just the day |
|
62 | 62 | $lang['l_rss_language'] = 'de-de'; |
63 | -$lang['l_search_took'] = 'Suche dauerte %s Sekunden'; |
|
63 | +$lang['l_search_took'] = 'Suche dauerte %s Sekunden'; |
|
64 | 64 | $lang['l_recurring_event'] = 'Wiederkehrender Eintrag'; |
65 | 65 | $lang['l_exception'] = 'Ausnahme'; |
66 | 66 | $lang['l_no_query'] = 'Kein Suchbegriff'; |
67 | 67 | $lang['l_preferences'] = 'Einstellungen'; |
68 | -$lang['l_printer'] = 'Drucker'; |
|
68 | +$lang['l_printer'] = 'Drucker'; |
|
69 | 69 | $lang['l_select_lang'] = 'Standardsprache wählen'; |
70 | 70 | $lang['l_select_cal'] = 'Standardkalender wählen'; |
71 | 71 | $lang['l_select_view'] = 'Standardansicht wählen'; |
72 | 72 | $lang['l_select_time'] = 'Tag beginnt um'; |
73 | 73 | $lang['l_select_day'] = 'Woche beginnt mit'; |
74 | -$lang['l_select_style'] = 'Standardstil wählen'; |
|
74 | +$lang['l_select_style'] = 'Standardstil wählen'; |
|
75 | 75 | $lang['l_set_prefs'] = 'Einstellungen speichern'; |
76 | -$lang['l_completed_date'] = 'Erledigt am'; |
|
76 | +$lang['l_completed_date'] = 'Erledigt am'; |
|
77 | 77 | $lang['l_completed'] = 'Erledigt'; |
78 | -$lang['l_created'] = 'Erstellt'; |
|
79 | -$lang['l_due'] = 'Fällig:'; |
|
78 | +$lang['l_created'] = 'Erstellt'; |
|
79 | +$lang['l_due'] = 'Fällig:'; |
|
80 | 80 | $lang['l_priority'] = 'Priorität:'; |
81 | 81 | $lang['l_priority_high'] = 'hoch'; |
82 | 82 | $lang['l_priority_low'] = 'niedrig'; |
83 | -$lang['l_priority_medium'] = 'mittel'; |
|
83 | +$lang['l_priority_medium'] = 'mittel'; |
|
84 | 84 | $lang['l_priority_none'] = 'keine'; |
85 | -$lang['l_status'] = 'Status'; |
|
86 | -$lang['l_status_confirmed'] = 'Bestätigt' ; |
|
85 | +$lang['l_status'] = 'Status'; |
|
86 | +$lang['l_status_confirmed'] = 'Bestätigt'; |
|
87 | 87 | $lang['l_status_cancelled'] = 'Abgesagt'; |
88 | 88 | $lang['l_status_tentative'] = 'Vorläufig'; |
89 | -$lang['l_todo'] = 'Aufgaben'; |
|
89 | +$lang['l_todo'] = 'Aufgaben'; |
|
90 | 90 | $lang['l_unfinished'] = 'Andauernd'; |
91 | 91 | $lang['l_prefs_set'] = 'Einstellungen wurden gespeichert.'; |
92 | 92 | $lang['l_prefs_unset'] = 'Einstellungen gelöscht. änderungen werden beim Aufruf der nächsten Seite aktiv.'; |
@@ -94,26 +94,26 @@ discard block |
||
94 | 94 | $lang['l_organizer'] = 'Organisator'; |
95 | 95 | $lang['l_attendee'] = 'Teilnehmer'; |
96 | 96 | $lang['l_location'] = 'Ort'; |
97 | -$lang['l_admin_header'] = 'PHP iCalendar Administration'; |
|
97 | +$lang['l_admin_header'] = 'PHP iCalendar Administration'; |
|
98 | 98 | $lang['l_username'] = 'Benutzername'; |
99 | 99 | $lang['l_password'] = 'Passwort'; |
100 | -$lang['l_login'] = 'Anmelden'; |
|
100 | +$lang['l_login'] = 'Anmelden'; |
|
101 | 101 | $lang['l_invalid_login'] = 'Falscher Benutzername oder Passwort.'; |
102 | 102 | $lang['l_addupdate_cal'] = 'Kalender aktualisieren oder hochladen'; |
103 | -$lang['l_addupdate_desc'] = 'Um einen Kalendar hinzuzufügen, laden Sie ein neues Kalender Dokument hoch. Um einen Kalender zu aktualisieren, laden Sie ein Kalender Dokument mit dem selben Namen hoch.'; |
|
104 | -$lang['l_delete_cal'] = 'Einen Kalender löschen'; |
|
105 | -$lang['l_logout'] = 'Abmelden'; |
|
103 | +$lang['l_addupdate_desc'] = 'Um einen Kalendar hinzuzufügen, laden Sie ein neues Kalender Dokument hoch. Um einen Kalender zu aktualisieren, laden Sie ein Kalender Dokument mit dem selben Namen hoch.'; |
|
104 | +$lang['l_delete_cal'] = 'Einen Kalender löschen'; |
|
105 | +$lang['l_logout'] = 'Abmelden'; |
|
106 | 106 | $lang['l_cal_file'] = 'Kalender Dokument'; |
107 | 107 | $lang['l_php_error'] = 'PHP Fehler'; |
108 | -$upload_error_gen_lang = 'Es ist ein Problem beim Hochladen aufgetreten.'; |
|
108 | +$upload_error_gen_lang = 'Es ist ein Problem beim Hochladen aufgetreten.'; |
|
109 | 109 | $upload_error_lang[0] = 'Fehler beim Hochladen des Dokuments.'; |
110 | 110 | $upload_error_lang[1] = 'Das hochzuladende Dokument ist zu gross.'; |
111 | 111 | $upload_error_lang[2] = 'Das Dokument, welches Sie versuchen hochzuladen, ist zu gross.'; |
112 | 112 | $upload_error_lang[3] = 'Das Dokument, welches Sie versuchen hochzuladen wurde nur teilweise empfangen.'; |
113 | 113 | $upload_error_lang[4] = 'Sie müssen ein Dokument zum Hochladen auswählen.'; |
114 | 114 | $lang['l_upload_error_type'] = 'Nur Dokumente mit der Suffix .ics dürfen hochgeladen werden.'; |
115 | -$lang['l_copy_error'] = 'Kopieren des Dokuments nicht erfolgreich'; |
|
116 | -$lang['l_delete_error'] = 'Löschen des Dokuments nicht erfolgreich'; |
|
115 | +$lang['l_copy_error'] = 'Kopieren des Dokuments nicht erfolgreich'; |
|
116 | +$lang['l_delete_error'] = 'Löschen des Dokuments nicht erfolgreich'; |
|
117 | 117 | $lang['l_delete_success'] = 'wurde gelöscht.'; |
118 | 118 | $lang['l_action_success'] = 'Die Aktion war erfolgreich.'; |
119 | 119 | $lang['l_submit'] = 'Absenden'; |
@@ -121,51 +121,51 @@ discard block |
||
121 | 121 | $all_cal_comb_lang = 'Alle Kalender zusammen'; |
122 | 122 | |
123 | 123 | // New for 2.0 |
124 | -$lang['l_legend'] = 'Legende'; |
|
124 | +$lang['l_legend'] = 'Legende'; |
|
125 | 125 | $lang['l_admin_subhead'] = 'Verwalten Sie Ihre Kalender mit dieser Seite'; |
126 | 126 | $lang['l_prefs_subhead'] = 'Sets a cookie for visiting this site'; |
127 | -$lang['l_rss_info'] = 'RSS Information'; |
|
128 | -$lang['l_rss_subhead'] = 'Basic RSS feeds available for each calendar'; |
|
129 | -$lang['l_rss_notenabled'] = 'RSS is not enabled on this site'; |
|
127 | +$lang['l_rss_info'] = 'RSS Information'; |
|
128 | +$lang['l_rss_subhead'] = 'Basic RSS feeds available for each calendar'; |
|
129 | +$lang['l_rss_notenabled'] = 'RSS is not enabled on this site'; |
|
130 | 130 | |
131 | 131 | // - navigation |
132 | 132 | $lang['l_back'] = 'Zurück'; |
133 | 133 | $lang['l_next'] = 'Nächste'; |
134 | 134 | $lang['l_prev'] = 'Vorherige'; |
135 | -$lang['l_day_view'] = 'Tagesansicht'; |
|
135 | +$lang['l_day_view'] = 'Tagesansicht'; |
|
136 | 136 | $lang['l_week_view'] = 'Wochenansicht'; |
137 | -$lang['l_month_view'] = 'Monatsansicht'; |
|
137 | +$lang['l_month_view'] = 'Monatsansicht'; |
|
138 | 138 | $lang['l_year_view'] = 'Jahresansicht'; |
139 | 139 | |
140 | 140 | // --------------------------------- |
141 | 141 | |
142 | 142 | |
143 | 143 | // $format_recur, items enclosed in % will be substituted with variables |
144 | -$format_recur_lang['delimiter'] = ', '; // ie, 'one, two, three' |
|
144 | +$format_recur_lang['delimiter'] = ', '; // ie, 'one, two, three' |
|
145 | 145 | |
146 | -$format_recur_lang['yearly'] = array('Jahr','Jahre'); // for these, put singular |
|
147 | -$format_recur_lang['monthly'] = array('Monat','Monate'); // and plural forms |
|
148 | -$format_recur_lang['weekly'] = array('Woche','Wochen'); // these will be %freq% |
|
149 | -$format_recur_lang['daily'] = array('Tag','Tage'); // in the replacement below |
|
150 | -$format_recur_lang['hourly'] = array('Stunde','Stunden'); |
|
151 | -$format_recur_lang['minutely'] = array('Minute','Minuten'); |
|
152 | -$format_recur_lang['secondly'] = array('Sekunde','Sekunden'); |
|
146 | +$format_recur_lang['yearly'] = array('Jahr', 'Jahre'); // for these, put singular |
|
147 | +$format_recur_lang['monthly'] = array('Monat', 'Monate'); // and plural forms |
|
148 | +$format_recur_lang['weekly'] = array('Woche', 'Wochen'); // these will be %freq% |
|
149 | +$format_recur_lang['daily'] = array('Tag', 'Tage'); // in the replacement below |
|
150 | +$format_recur_lang['hourly'] = array('Stunde', 'Stunden'); |
|
151 | +$format_recur_lang['minutely'] = array('Minute', 'Minuten'); |
|
152 | +$format_recur_lang['secondly'] = array('Sekunde', 'Sekunden'); |
|
153 | 153 | |
154 | -$format_recur_lang['start'] = 'Jeden %int% %freq% %for%'; // ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5' |
|
155 | -$format_recur_lang['until'] = 'bis %date%'; // ie, 'until January 4' |
|
156 | -$format_recur_lang['count'] = 'für %int% Mal'; // ie, 'for 5 times' |
|
154 | +$format_recur_lang['start'] = 'Jeden %int% %freq% %for%'; // ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5' |
|
155 | +$format_recur_lang['until'] = 'bis %date%'; // ie, 'until January 4' |
|
156 | +$format_recur_lang['count'] = 'für %int% Mal'; // ie, 'for 5 times' |
|
157 | 157 | |
158 | -$format_recur_lang['bymonth'] = 'In den Monaten: %list%'; // ie, 'In months: January, February, March' |
|
159 | -$format_recur_lang['bymonthday'] = 'An den Daten: %list%'; // ie, 'On dates: 1, 2, 3, 4' |
|
160 | -$format_recur_lang['byday'] = 'An den Tagen: %list%'; // ie, 'On days: Mon, Tues, Wed, Thurs' |
|
158 | +$format_recur_lang['bymonth'] = 'In den Monaten: %list%'; // ie, 'In months: January, February, March' |
|
159 | +$format_recur_lang['bymonthday'] = 'An den Daten: %list%'; // ie, 'On dates: 1, 2, 3, 4' |
|
160 | +$format_recur_lang['byday'] = 'An den Tagen: %list%'; // ie, 'On days: Mon, Tues, Wed, Thurs' |
|
161 | 161 | |
162 | 162 | // --------------------------------- |
163 | 163 | |
164 | -$daysofweek_lang = array ('Sonntag','Montag','Dienstag','Mittwoch','Donnerstag','Freitag','Samstag'); |
|
165 | -$daysofweekshort_lang = array ('So','Mo','Di','Mi','Do','Fr','Sa'); |
|
166 | -$daysofweekreallyshort_lang = array ('So','Mo','Di','Mi','Do','Fr','Sa'); |
|
167 | -$monthsofyear_lang = array ('Januar','Februar','März','April','Mai','Juni','Juli','August','September','Oktober','November','Dezember'); |
|
168 | -$monthsofyearshort_lang = array ('Jan','Feb','Mär','Apr','Mai','Jun','Jul','Aug','Sep','Okt','Nov','Dez'); |
|
164 | +$daysofweek_lang = array('Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'); |
|
165 | +$daysofweekshort_lang = array('So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'); |
|
166 | +$daysofweekreallyshort_lang = array('So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'); |
|
167 | +$monthsofyear_lang = array('Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'); |
|
168 | +$monthsofyearshort_lang = array('Jan', 'Feb', 'Mär', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'); |
|
169 | 169 | |
170 | 170 | // For time formatting, check out: http://www.php.net/manual/en/function.date.php |
171 | 171 | $timeFormat = 'H:i'; |
@@ -199,11 +199,11 @@ discard block |
||
199 | 199 | // Error messages - %s will be replaced with a variable |
200 | 200 | $lang['l_error_title'] = 'Fehler!'; |
201 | 201 | $lang['l_error_window'] = 'Es ist ein Fehler aufgetreten!'; |
202 | -$lang['l_error_calendar'] = 'Der Kalender "%s" wurde bearbeitet, als dieser Fehler auftrat.'; |
|
202 | +$lang['l_error_calendar'] = 'Der Kalender "%s" wurde bearbeitet, als dieser Fehler auftrat.'; |
|
203 | 203 | $lang['l_error_path'] = 'Der Pfad "%s" kann nicht geöffnet werden.'; |
204 | 204 | $lang['l_error_back'] = 'Bitte klicken Sie die "Zurück" Schaltfläche des Browsers um zurückzuspringen.'; |
205 | 205 | $lang['l_error_remotecal'] = 'Dieser Server blockiert entfernte Kalender, welche nicht freigegeben wurden.'; |
206 | -$lang['l_error_restrictedcal'] = 'Sie haben versucht einen Kalender mit eingeschränktem Zugriff auf diesem Server aufzurufen.'; |
|
206 | +$lang['l_error_restrictedcal'] = 'Sie haben versucht einen Kalender mit eingeschränktem Zugriff auf diesem Server aufzurufen.'; |
|
207 | 207 | $lang['l_error_invalidcal'] = 'Dieser Kalender enthält Fehler. Bitte wählen Sie einen anderen aus.'; |
208 | 208 | |
209 | 209 | ?> |
@@ -9,25 +9,25 @@ discard block |
||
9 | 9 | |
10 | 10 | $lang['l_day'] = 'Dag'; |
11 | 11 | $lang['l_week'] = 'Uke'; |
12 | -$lang['l_month'] = 'Måned'; |
|
12 | +$lang['l_month'] = 'Måned'; |
|
13 | 13 | $lang['l_year'] = 'År'; |
14 | 14 | $lang['l_calendar'] = 'Kalender'; |
15 | 15 | $lang['l_next_day'] = 'Neste dag'; |
16 | -$lang['l_next_month'] = 'Neste måned'; |
|
16 | +$lang['l_next_month'] = 'Neste måned'; |
|
17 | 17 | $lang['l_next_week'] = 'Neste uke'; |
18 | 18 | $lang['l_next_year'] = 'Neste år'; |
19 | -$lang['l_last_day'] = 'Forrige dag'; |
|
20 | -$lang['l_last_month'] = 'Forrige måned'; |
|
19 | +$lang['l_last_day'] = 'Forrige dag'; |
|
20 | +$lang['l_last_month'] = 'Forrige måned'; |
|
21 | 21 | $lang['l_last_week'] = 'Forrige uke'; |
22 | 22 | $lang['l_last_year'] = 'Forrige år'; |
23 | 23 | $lang['l_subscribe'] = 'Abonner'; |
24 | -$lang['l_download'] = 'Last ned'; |
|
25 | -$lang['l_powered_by'] = 'Kjøres med'; |
|
26 | -$lang['l_event'] = 'Hendelse'; |
|
24 | +$lang['l_download'] = 'Last ned'; |
|
25 | +$lang['l_powered_by'] = 'Kjøres med'; |
|
26 | +$lang['l_event'] = 'Hendelse'; |
|
27 | 27 | $lang['l_event_start'] = 'Starttid'; |
28 | -$lang['l_event_end'] = 'End Time'; |
|
28 | +$lang['l_event_end'] = 'End Time'; |
|
29 | 29 | $lang['l_this_months'] = 'Hendelser denne måneden'; |
30 | -$lang['l_date'] = 'Dato'; |
|
30 | +$lang['l_date'] = 'Dato'; |
|
31 | 31 | $lang['l_summary'] = 'Sammendrag'; |
32 | 32 | $lang['l_all_day'] = 'Heldagshendelse'; |
33 | 33 | $lang['l_notes'] = 'Notater'; |
@@ -35,84 +35,84 @@ discard block |
||
35 | 35 | $lang['l_today'] = 'I dag'; |
36 | 36 | $lang['l_this_week'] = 'Denne uka'; |
37 | 37 | $lang['l_this_month'] = 'Denne måneden'; |
38 | -$lang['l_jump'] = 'Gå til'; |
|
38 | +$lang['l_jump'] = 'Gå til'; |
|
39 | 39 | $lang['l_tomorrows'] = 'Morgendagens hendelser'; |
40 | -$lang['l_goday'] = 'Vis dagen i dag'; |
|
40 | +$lang['l_goday'] = 'Vis dagen i dag'; |
|
41 | 41 | $lang['l_goweek'] = 'Vis denne uka'; |
42 | 42 | $lang['l_gomonth'] = 'Vis denne måneden'; |
43 | 43 | $lang['l_goyear'] = 'Vis dette året'; |
44 | 44 | $lang['l_search'] = 'Søk'; // the verb |
45 | 45 | $lang['l_results'] = 'Søkeresultater'; |
46 | -$lang['l_pick_multiple'] = 'Pick multiple'; |
|
47 | -$lang['l_query'] = 'Forespørsel: '; // will be followed by the search query |
|
48 | -$lang['l_no_results'] = 'Ingen hendelser'; |
|
46 | +$lang['l_pick_multiple'] = 'Pick multiple'; |
|
47 | +$lang['l_query'] = 'Forespørsel: '; // will be followed by the search query |
|
48 | +$lang['l_no_results'] = 'Ingen hendelser'; |
|
49 | 49 | $lang['l_goprint'] = 'Utskriftsvennlig'; |
50 | -$lang['l_time'] = 'Tid'; |
|
50 | +$lang['l_time'] = 'Tid'; |
|
51 | 51 | $lang['l_summary'] = 'Oppsummering'; |
52 | 52 | $lang['l_description'] = 'Beskrivelse'; |
53 | 53 | $lang['l_this_site_is'] = 'Dette webstedet er'; |
54 | 54 | $lang['l_no_events_day'] = 'Ingen hendelser i dag.'; |
55 | 55 | $lang['l_no_events_week'] = 'Ingen hendelser denne uka.'; |
56 | 56 | $lang['l_no_events_month'] = 'Ingen hendelser denne måneden.'; |
57 | -$lang['l_rss_day_date'] = 'g:i A'; // Lists just the time |
|
58 | -$lang['l_rss_week_date '] = '%b %e'; // Lists just the day |
|
59 | -$lang['l_rss_month_date '] = '%b %e'; // Lists just the day |
|
57 | +$lang['l_rss_day_date'] = 'g:i A'; // Lists just the time |
|
58 | +$lang['l_rss_week_date '] = '%b %e'; // Lists just the day |
|
59 | +$lang['l_rss_month_date '] = '%b %e'; // Lists just the day |
|
60 | 60 | $lang['l_rss_language'] = 'en-us'; |
61 | -$lang['l_search_took'] = 'Søket ti %s sekunder'; |
|
61 | +$lang['l_search_took'] = 'Søket ti %s sekunder'; |
|
62 | 62 | $lang['l_recurring_event'] = 'Repeterende hendelse'; |
63 | 63 | $lang['l_exception'] = 'Unntak'; |
64 | 64 | $lang['l_no_query'] = 'Ingen forespørsel oppgitt'; |
65 | 65 | $lang['l_preferences'] = 'Valg'; |
66 | -$lang['l_printer'] = 'Skriver'; |
|
66 | +$lang['l_printer'] = 'Skriver'; |
|
67 | 67 | $lang['l_select_lang'] = 'Velg språk'; |
68 | 68 | $lang['l_select_cal'] = 'Velg standardkalender'; |
69 | 69 | $lang['l_select_view'] = 'Velg standardvisning'; |
70 | 70 | $lang['l_select_time'] = 'Velg standard starttid'; |
71 | 71 | $lang['l_select_day'] = 'Uken starter på'; |
72 | -$lang['l_select_style'] = 'Velg visningsstil'; |
|
72 | +$lang['l_select_style'] = 'Velg visningsstil'; |
|
73 | 73 | $lang['l_set_prefs'] = 'Lagre valg'; |
74 | -$lang['l_completed_date'] = 'Ferdig på'; |
|
74 | +$lang['l_completed_date'] = 'Ferdig på'; |
|
75 | 75 | $lang['l_completed'] = 'Ferdig'; |
76 | -$lang['l_created'] = 'Opprettet'; |
|
77 | -$lang['l_due'] = 'Forfall'; |
|
76 | +$lang['l_created'] = 'Opprettet'; |
|
77 | +$lang['l_due'] = 'Forfall'; |
|
78 | 78 | $lang['l_priority'] = 'Prioritet'; |
79 | 79 | $lang['l_priority_high'] = 'Høy'; |
80 | 80 | $lang['l_priority_low'] = 'Lav'; |
81 | -$lang['l_priority_medium'] = 'Medium'; |
|
81 | +$lang['l_priority_medium'] = 'Medium'; |
|
82 | 82 | $lang['l_priority_none'] = 'Ingen'; |
83 | -$lang['l_status'] = 'Status'; |
|
84 | -$lang['l_status_confirmed'] = 'CONFIRMED' ; |
|
83 | +$lang['l_status'] = 'Status'; |
|
84 | +$lang['l_status_confirmed'] = 'CONFIRMED'; |
|
85 | 85 | $lang['l_status_cancelled'] = 'CANCELLED'; |
86 | 86 | $lang['l_status_tentative'] = 'TENTATIVE'; |
87 | -$lang['l_todo'] = 'Oppgaver'; |
|
87 | +$lang['l_todo'] = 'Oppgaver'; |
|
88 | 88 | $lang['l_unfinished'] = 'Uferdig'; |
89 | 89 | $lang['l_prefs_set'] = 'Valgene dine har blitt lagret.'; |
90 | 90 | $lang['l_prefs_unset'] = 'Valgene ble nullstilte. Endringer vises ved neste nedlasting av siden.'; |
91 | 91 | $lang['l_unset_prefs'] = 'Nullstill valg'; |
92 | 92 | $lang['l_organizer'] = 'Organisator'; |
93 | 93 | $lang['l_attendee'] = 'Deltaker'; |
94 | -$lang['l_status'] = 'Status'; |
|
94 | +$lang['l_status'] = 'Status'; |
|
95 | 95 | $lang['l_location'] = 'Sted'; |
96 | -$lang['l_admin_header'] = 'Administrasjon for PHP iCalendar'; |
|
96 | +$lang['l_admin_header'] = 'Administrasjon for PHP iCalendar'; |
|
97 | 97 | $lang['l_username'] = 'Brukernavn'; |
98 | 98 | $lang['l_password'] = 'Passord'; |
99 | -$lang['l_login'] = 'Logg inn'; |
|
99 | +$lang['l_login'] = 'Logg inn'; |
|
100 | 100 | $lang['l_invalid_login'] = 'Feil i brukernavn/passord.'; |
101 | 101 | $lang['l_addupdate_cal'] = 'Legg til eller oppdater kalender'; |
102 | -$lang['l_addupdate_desc'] = 'Legg til ny kalender ved å laste opp en ny fil. Oppdater en eksisterende ved å laste opp ny fil med samme navn.'; |
|
103 | -$lang['l_delete_cal'] = 'Slett kalender'; |
|
104 | -$lang['l_logout'] = 'Logg ut'; |
|
102 | +$lang['l_addupdate_desc'] = 'Legg til ny kalender ved å laste opp en ny fil. Oppdater en eksisterende ved å laste opp ny fil med samme navn.'; |
|
103 | +$lang['l_delete_cal'] = 'Slett kalender'; |
|
104 | +$lang['l_logout'] = 'Logg ut'; |
|
105 | 105 | $lang['l_cal_file'] = 'Kalenderfil'; |
106 | 106 | $lang['l_php_error'] = 'PHP-feil'; |
107 | -$upload_error_gen_lang = 'Problemer med opplastingen.'; |
|
107 | +$upload_error_gen_lang = 'Problemer med opplastingen.'; |
|
108 | 108 | $upload_error_lang[0] = 'Vi fikk problemer med opplastingen.'; |
109 | 109 | $upload_error_lang[1] = 'Filen du laster opp er for stor.'; |
110 | 110 | $upload_error_lang[2] = 'Filen du laster opp er for stor.'; |
111 | 111 | $upload_error_lang[3] = 'Filen du prøer å lasste opp ble bare delvis lastet.'; |
112 | 112 | $upload_error_lang[4] = 'Du må velge en fil å laste opp.'; |
113 | 113 | $lang['l_upload_error_type'] = 'Kun .ics-filer kan lastes opp.'; |
114 | -$lang['l_copy_error'] = 'Kunne ikke kopiere fila'; |
|
115 | -$lang['l_delete_error'] = 'Kunne ikke slette fila'; |
|
114 | +$lang['l_copy_error'] = 'Kunne ikke kopiere fila'; |
|
115 | +$lang['l_delete_error'] = 'Kunne ikke slette fila'; |
|
116 | 116 | $lang['l_delete_success'] = 'ble slettet.'; |
117 | 117 | $lang['l_action_success'] = 'Handlingen ble utført.'; |
118 | 118 | $lang['l_submit'] = 'Legg inn'; |
@@ -120,51 +120,51 @@ discard block |
||
120 | 120 | $all_cal_comb_lang = 'Alle kalendere samlet'; |
121 | 121 | |
122 | 122 | // New for 2.0 |
123 | -$lang['l_legend'] = 'Kalendere'; |
|
123 | +$lang['l_legend'] = 'Kalendere'; |
|
124 | 124 | $lang['l_admin_subhead'] = 'Styr kalenderne fra denne siden'; |
125 | 125 | $lang['l_prefs_subhead'] = 'Setter en informasjonskapsel for å lagre oppsettet'; |
126 | -$lang['l_rss_info'] = 'RSS-informasjon'; |
|
127 | -$lang['l_rss_subhead'] = 'RSS-strømmer er tilgjengelige for hver kalender'; |
|
128 | -$lang['l_rss_notenabled'] = 'RSS er ikke tilgjengelig'; |
|
126 | +$lang['l_rss_info'] = 'RSS-informasjon'; |
|
127 | +$lang['l_rss_subhead'] = 'RSS-strømmer er tilgjengelige for hver kalender'; |
|
128 | +$lang['l_rss_notenabled'] = 'RSS er ikke tilgjengelig'; |
|
129 | 129 | |
130 | 130 | // - navigation |
131 | 131 | $lang['l_back'] = 'Tilbake'; |
132 | 132 | $lang['l_next'] = 'Neste'; |
133 | 133 | $lang['l_prev'] = 'Forrige'; |
134 | -$lang['l_day_view'] = 'Dagsvisning'; |
|
134 | +$lang['l_day_view'] = 'Dagsvisning'; |
|
135 | 135 | $lang['l_week_view'] = 'Ukevisning'; |
136 | -$lang['l_month_view'] = 'Månedsvisning'; |
|
136 | +$lang['l_month_view'] = 'Månedsvisning'; |
|
137 | 137 | $lang['l_year_view'] = 'Årsvisning'; |
138 | 138 | |
139 | 139 | // --------------------------------- |
140 | 140 | |
141 | 141 | |
142 | 142 | // $format_recur, items enclosed in % will be substituted with variables |
143 | -$format_recur_lang['delimiter'] = ', '; // ie, 'one, two, three' |
|
143 | +$format_recur_lang['delimiter'] = ', '; // ie, 'one, two, three' |
|
144 | 144 | |
145 | -$format_recur_lang['yearly'] = array('år','årlig'); // for these, put singular |
|
146 | -$format_recur_lang['monthly'] = array('måned','måneder'); // and plural forms |
|
147 | -$format_recur_lang['weekly'] = array('uke','uker'); // these will be %freq% |
|
148 | -$format_recur_lang['daily'] = array('dag','dager'); // in the replacement below |
|
149 | -$format_recur_lang['hourly'] = array('time','timer'); |
|
150 | -$format_recur_lang['minutely'] = array('minutt','minutter'); |
|
151 | -$format_recur_lang['secondly'] = array('sekund','sekunder'); |
|
145 | +$format_recur_lang['yearly'] = array('år', 'årlig'); // for these, put singular |
|
146 | +$format_recur_lang['monthly'] = array('måned', 'måneder'); // and plural forms |
|
147 | +$format_recur_lang['weekly'] = array('uke', 'uker'); // these will be %freq% |
|
148 | +$format_recur_lang['daily'] = array('dag', 'dager'); // in the replacement below |
|
149 | +$format_recur_lang['hourly'] = array('time', 'timer'); |
|
150 | +$format_recur_lang['minutely'] = array('minutt', 'minutter'); |
|
151 | +$format_recur_lang['secondly'] = array('sekund', 'sekunder'); |
|
152 | 152 | |
153 | -$format_recur_lang['start'] = 'Hver %int% %freq% %for%'; // ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5' |
|
154 | -$format_recur_lang['until'] = 'til %date%'; // ie, 'until January 4' |
|
155 | -$format_recur_lang['count'] = 'for et antall av %int%'; // ie, 'for 5 times' |
|
153 | +$format_recur_lang['start'] = 'Hver %int% %freq% %for%'; // ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5' |
|
154 | +$format_recur_lang['until'] = 'til %date%'; // ie, 'until January 4' |
|
155 | +$format_recur_lang['count'] = 'for et antall av %int%'; // ie, 'for 5 times' |
|
156 | 156 | |
157 | -$format_recur_lang['bymonth'] = 'I måneder: %list%'; // ie, 'In months: January, February, March' |
|
158 | -$format_recur_lang['bymonthday'] = 'På datoene: %list%'; // ie, 'On dates: 1, 2, 3, 4' |
|
159 | -$format_recur_lang['byday'] = 'På dagene: %list%'; // ie, 'On days: Mon, Tues, Wed, Thurs' |
|
157 | +$format_recur_lang['bymonth'] = 'I måneder: %list%'; // ie, 'In months: January, February, March' |
|
158 | +$format_recur_lang['bymonthday'] = 'På datoene: %list%'; // ie, 'On dates: 1, 2, 3, 4' |
|
159 | +$format_recur_lang['byday'] = 'På dagene: %list%'; // ie, 'On days: Mon, Tues, Wed, Thurs' |
|
160 | 160 | |
161 | 161 | // --------------------------------- |
162 | 162 | |
163 | -$daysofweek_lang = array('søndag','mandag','tirsdag','onsdag','torsdag','fredag','lørdag'); |
|
164 | -$daysofweekshort_lang = array ('søn','man','tir','ons','tor','fre','lør'); |
|
165 | -$daysofweekreallyshort_lang = array ('S','M','T','O','T','F','L'); |
|
166 | -$monthsofyear_lang = array ('januar','februar','mars','april','mai','juni','juli','august','september','oktober','november','desember'); |
|
167 | -$monthsofyearshort_lang = array ('jan','feb','mar','apr','mai','jun','jul','aug','sep','okt','nov','des'); |
|
163 | +$daysofweek_lang = array('søndag', 'mandag', 'tirsdag', 'onsdag', 'torsdag', 'fredag', 'lørdag'); |
|
164 | +$daysofweekshort_lang = array('søn', 'man', 'tir', 'ons', 'tor', 'fre', 'lør'); |
|
165 | +$daysofweekreallyshort_lang = array('S', 'M', 'T', 'O', 'T', 'F', 'L'); |
|
166 | +$monthsofyear_lang = array('januar', 'februar', 'mars', 'april', 'mai', 'juni', 'juli', 'august', 'september', 'oktober', 'november', 'desember'); |
|
167 | +$monthsofyearshort_lang = array('jan', 'feb', 'mar', 'apr', 'mai', 'jun', 'jul', 'aug', 'sep', 'okt', 'nov', 'des'); |
|
168 | 168 | |
169 | 169 | // For time formatting, check out: http://www.php.net/manual/en/function.date.php |
170 | 170 | $timeFormat = 'H:i'; |
@@ -198,13 +198,13 @@ discard block |
||
198 | 198 | // Error messages - %s will be replaced with a variable |
199 | 199 | $lang['l_error_title'] = 'Feil!'; |
200 | 200 | $lang['l_error_window'] = 'En feil oppsto!'; |
201 | -$lang['l_error_calendar'] = 'Kalenderen "%s" var i bruk da feilen oppsto.'; |
|
201 | +$lang['l_error_calendar'] = 'Kalenderen "%s" var i bruk da feilen oppsto.'; |
|
202 | 202 | $lang['l_error_path'] = 'Kan ikke åpne stien "%s"'; |
203 | 203 | $lang['l_error_back'] = 'Bruk "Tilbake"-knappen for å gå tilbake.'; |
204 | 204 | $lang['l_error_remotecal'] = 'Denne tjeneren sperrer ikke-lokale kalendere som ikke har blitt godkjent.'; |
205 | -$lang['l_error_restrictedcal'] = 'Du prøver å åpne en kalender som har begrenset tilgang.'; |
|
205 | +$lang['l_error_restrictedcal'] = 'Du prøver å åpne en kalender som har begrenset tilgang.'; |
|
206 | 206 | $lang['l_error_invalidcal'] = 'Ugyldig kalenderfil. Prøv en anenn kalender.'; |
207 | -$lang['l_error_cantopen'] = 'Kunne ikke åpne kalenderfila.'; |
|
208 | -$lang['l_error_cache'] = 'Klarer ikke å skrive til cache-mappen. Sjekk oppsettet på webstedet.'; |
|
207 | +$lang['l_error_cantopen'] = 'Kunne ikke åpne kalenderfila.'; |
|
208 | +$lang['l_error_cache'] = 'Klarer ikke å skrive til cache-mappen. Sjekk oppsettet på webstedet.'; |
|
209 | 209 | |
210 | 210 | ?> |
@@ -1,15 +1,15 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -require_once(__DIR__ . '/../../config.inc.php'); |
|
4 | -require_once(APP_PATH . '/include/debug.inc.php'); |
|
3 | +require_once(__DIR__.'/../../config.inc.php'); |
|
4 | +require_once(APP_PATH.'/include/debug.inc.php'); |
|
5 | 5 | |
6 | -if(!defined('API_CLIENT_ERROR_RETRIES')) { |
|
6 | +if (!defined('API_CLIENT_ERROR_RETRIES')) { |
|
7 | 7 | define('API_CLIENT_ERROR_RETRIES', 5); |
8 | - debug_log('Using default API_CLIENT_ERROR_RETRIES = ' . API_CLIENT_ERROR_RETRIES); |
|
8 | + debug_log('Using default API_CLIENT_ERROR_RETRIES = '.API_CLIENT_ERROR_RETRIES); |
|
9 | 9 | } |
10 | -if(!defined('API_SERVER_ERROR_RETRIES')) { |
|
11 | - define('API_SERVER_ERROR_RETRIES', API_CLIENT_ERROR_RETRIES * 5); |
|
12 | - debug_log('Using default API_SERVER_ERROR_RETRIES = ' . API_SERVER_ERROR_RETRIES); |
|
10 | +if (!defined('API_SERVER_ERROR_RETRIES')) { |
|
11 | + define('API_SERVER_ERROR_RETRIES', API_CLIENT_ERROR_RETRIES*5); |
|
12 | + debug_log('Using default API_SERVER_ERROR_RETRIES = '.API_SERVER_ERROR_RETRIES); |
|
13 | 13 | } |
14 | 14 | |
15 | 15 | /* the verbs available within the Canvas REST API */ |
@@ -35,10 +35,10 @@ discard block |
||
35 | 35 | // TODO: we could extend this to include more specificity about the Pest exceptions... |
36 | 36 | |
37 | 37 | /* we use Pest to interact with the RESTful API */ |
38 | -require_once(APP_PATH . '/include/Pest.php'); |
|
38 | +require_once(APP_PATH.'/include/Pest.php'); |
|
39 | 39 | |
40 | 40 | /* handles HTML page generation */ |
41 | -require_once(APP_PATH . '/include/page-generator.inc.php'); |
|
41 | +require_once(APP_PATH.'/include/page-generator.inc.php'); |
|
42 | 42 | |
43 | 43 | class CanvasApiProcess { |
44 | 44 | |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | } |
86 | 86 | |
87 | 87 | private function buildCanvasAuthorizationHeader() { |
88 | - return array ('Authorization' => 'Bearer ' . $this->authorizationToken); |
|
88 | + return array('Authorization' => 'Bearer '.$this->authorizationToken); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | /* who knows what goes on in the server's mind... try again */ |
137 | 137 | $serverRetryCount++; |
138 | 138 | $retry = true; |
139 | - debug_log('Retrying after Canvas API server error. ' . substr($e->getMessage(), 0, CANVAS_API_EXCEPTION_MAX_LENGTH)); |
|
139 | + debug_log('Retrying after Canvas API server error. '.substr($e->getMessage(), 0, CANVAS_API_EXCEPTION_MAX_LENGTH)); |
|
140 | 140 | } |
141 | 141 | } catch (Pest_ClientError $e) { |
142 | 142 | if ($throwsExceptions & CANVAS_API_EXCEPTION_CLIENT) { |
@@ -146,14 +146,14 @@ discard block |
||
146 | 146 | I was authorized. Everything gets retried a few times before I give up */ |
147 | 147 | $clientRetryCount++; |
148 | 148 | $retry = true; |
149 | - debug_log('Retrying after Canvas API client error. ' . substr($e->getMessage(), 0, CANVAS_API_EXCEPTION_MAX_LENGTH)); |
|
149 | + debug_log('Retrying after Canvas API client error. '.substr($e->getMessage(), 0, CANVAS_API_EXCEPTION_MAX_LENGTH)); |
|
150 | 150 | } |
151 | 151 | } catch (Exception $e) { |
152 | 152 | // treat an empty reply as a server error (which, BTW, it dang well is) |
153 | 153 | if ($e->getMessage() == 'Empty reply from server') { |
154 | 154 | $serverRetryCount++; |
155 | 155 | $retry = true; |
156 | - debug_log('Retrying after empty reply from server. ' . substr($e->getMessage(), 0, CANVAS_API_EXCEPTION_MAX_LENGTH)); |
|
156 | + debug_log('Retrying after empty reply from server. '.substr($e->getMessage(), 0, CANVAS_API_EXCEPTION_MAX_LENGTH)); |
|
157 | 157 | } else { |
158 | 158 | displayError( |
159 | 159 | array( |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | ), |
183 | 183 | true, |
184 | 184 | 'Probable Client Error', |
185 | - 'After trying ' . API_CLIENT_ERROR_RETRIES . ' times, we still got this error message from the API. (Remember to check to be sure that the object ID passed to the API is valid and exists if the API tells you that you\'re not authorized... because you\'re not authorized to work with things that don\'t exist!)' |
|
185 | + 'After trying '.API_CLIENT_ERROR_RETRIES.' times, we still got this error message from the API. (Remember to check to be sure that the object ID passed to the API is valid and exists if the API tells you that you\'re not authorized... because you\'re not authorized to work with things that don\'t exist!)' |
|
186 | 186 | ); |
187 | 187 | exit; |
188 | 188 | } |
@@ -198,7 +198,7 @@ discard block |
||
198 | 198 | ), |
199 | 199 | true, |
200 | 200 | 'Probable Server Error', |
201 | - 'After trying ' . API_CLIENT_ERROR_RETRIES . ' times, we still got this error message from the API.' |
|
201 | + 'After trying '.API_CLIENT_ERROR_RETRIES.' times, we still got this error message from the API.' |
|
202 | 202 | ); |
203 | 203 | exit; |
204 | 204 | } |
@@ -1,7 +1,7 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -require_once(__DIR__ . '/../config.inc.php'); |
|
4 | -require_once(APP_PATH . '/include/class/CanvasApiProcess.class.php'); |
|
3 | +require_once(__DIR__.'/../config.inc.php'); |
|
4 | +require_once(APP_PATH.'/include/class/CanvasApiProcess.class.php'); |
|
5 | 5 | |
6 | 6 | $CANVAS_API = new CanvasApiProcess(CANVAS_API_URL, CANVAS_API_TOKEN); |
7 | 7 |
@@ -81,8 +81,8 @@ discard block |
||
81 | 81 | */ |
82 | 82 | public function setupAuth($user, $pass, $auth = 'basic') |
83 | 83 | { |
84 | - $this->curl_opts[CURLOPT_HTTPAUTH] = constant('CURLAUTH_' . strtoupper($auth)); |
|
85 | - $this->curl_opts[CURLOPT_USERPWD] = $user . ":" . $pass; |
|
84 | + $this->curl_opts[CURLOPT_HTTPAUTH] = constant('CURLAUTH_'.strtoupper($auth)); |
|
85 | + $this->curl_opts[CURLOPT_USERPWD] = $user.":".$pass; |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | /** |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | $this->curl_opts[CURLOPT_PROXY] = $host; |
99 | 99 | $this->curl_opts[CURLOPT_PROXYPORT] = $port; |
100 | 100 | if ($user && $pass) { |
101 | - $this->curl_opts[CURLOPT_PROXYUSERPWD] = $user . ":" . $pass; |
|
101 | + $this->curl_opts[CURLOPT_PROXYUSERPWD] = $user.":".$pass; |
|
102 | 102 | } |
103 | 103 | } |
104 | 104 | |
@@ -110,14 +110,14 @@ discard block |
||
110 | 110 | * @param array $headers |
111 | 111 | * @return string |
112 | 112 | */ |
113 | - public function get($url, $data = array(), $headers=array()) |
|
113 | + public function get($url, $data = array(), $headers = array()) |
|
114 | 114 | { |
115 | 115 | if (!empty($data)) { |
116 | 116 | $pos = strpos($url, '?'); |
117 | 117 | if ($pos !== false) { |
118 | 118 | $url = substr($url, 0, $pos); |
119 | 119 | } |
120 | - $url .= '?' . http_build_query($data); |
|
120 | + $url .= '?'.http_build_query($data); |
|
121 | 121 | } |
122 | 122 | |
123 | 123 | $curl_opts = $this->curl_opts; |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | protected function prepRequest($opts, $url) |
143 | 143 | { |
144 | 144 | if (strncmp($url, $this->base_url, strlen($this->base_url)) != 0) { |
145 | - $url = rtrim($this->base_url, '/') . '/' . ltrim($url, '/'); |
|
145 | + $url = rtrim($this->base_url, '/').'/'.ltrim($url, '/'); |
|
146 | 146 | } |
147 | 147 | |
148 | 148 | $curl = curl_init($url); |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | |
195 | 195 | $flattened = array(); |
196 | 196 | foreach ($headers as $name => $value) { |
197 | - $flattened[] = $name . ': ' . $value; |
|
197 | + $flattened[] = $name.': '.$value; |
|
198 | 198 | } |
199 | 199 | |
200 | 200 | return $flattened; |
@@ -356,7 +356,7 @@ discard block |
||
356 | 356 | |
357 | 357 | $curl_opts = $this->curl_opts; |
358 | 358 | $curl_opts[CURLOPT_CUSTOMREQUEST] = 'POST'; |
359 | - if (!is_array($data)) $headers[] = 'Content-Length: ' . strlen($data); |
|
359 | + if (!is_array($data)) $headers[] = 'Content-Length: '.strlen($data); |
|
360 | 360 | $curl_opts[CURLOPT_HTTPHEADER] = $this->prepHeaders($headers); |
361 | 361 | $curl_opts[CURLOPT_POSTFIELDS] = $data; |
362 | 362 | |
@@ -405,7 +405,7 @@ discard block |
||
405 | 405 | |
406 | 406 | $curl_opts = $this->curl_opts; |
407 | 407 | $curl_opts[CURLOPT_CUSTOMREQUEST] = 'PUT'; |
408 | - if (!is_array($data)) $headers[] = 'Content-Length: ' . strlen($data); |
|
408 | + if (!is_array($data)) $headers[] = 'Content-Length: '.strlen($data); |
|
409 | 409 | $curl_opts[CURLOPT_HTTPHEADER] = $this->prepHeaders($headers); |
410 | 410 | $curl_opts[CURLOPT_POSTFIELDS] = $data; |
411 | 411 | |
@@ -431,7 +431,7 @@ discard block |
||
431 | 431 | |
432 | 432 | $curl_opts = $this->curl_opts; |
433 | 433 | $curl_opts[CURLOPT_CUSTOMREQUEST] = 'PATCH'; |
434 | - $headers[] = 'Content-Length: ' . strlen($data); |
|
434 | + $headers[] = 'Content-Length: '.strlen($data); |
|
435 | 435 | $curl_opts[CURLOPT_HTTPHEADER] = $this->prepHeaders($headers); |
436 | 436 | $curl_opts[CURLOPT_POSTFIELDS] = $data; |
437 | 437 | |
@@ -450,13 +450,13 @@ discard block |
||
450 | 450 | * @param array $headers |
451 | 451 | * @return string |
452 | 452 | */ |
453 | - public function delete($url, $data, $headers=array()) |
|
453 | + public function delete($url, $data, $headers = array()) |
|
454 | 454 | { |
455 | 455 | $data = $this->prepData($data); |
456 | 456 | |
457 | 457 | $curl_opts = $this->curl_opts; |
458 | 458 | $curl_opts[CURLOPT_CUSTOMREQUEST] = 'DELETE'; |
459 | - if (!is_array($data)) $headers[] = 'Content-Length: ' . strlen($data); |
|
459 | + if (!is_array($data)) $headers[] = 'Content-Length: '.strlen($data); |
|
460 | 460 | $curl_opts[CURLOPT_HTTPHEADER] = $this->prepHeaders($headers); |
461 | 461 | $curl_opts[CURLOPT_POSTFIELDS] = $data; |
462 | 462 |
@@ -1,11 +1,11 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -require_once(__DIR__ . '/../config.inc.php'); |
|
4 | -require_once(APP_PATH . '/include/debug.inc.php'); |
|
3 | +require_once(__DIR__.'/../config.inc.php'); |
|
4 | +require_once(APP_PATH.'/include/debug.inc.php'); |
|
5 | 5 | |
6 | 6 | if (!defined('WORKING_DIR')) { |
7 | 7 | define('WORKING_DIR', '/var/www-data/canvas/tmp/'); |
8 | - debug_log('Using default WORKING_DIR = "' . WORKING_DIR . '"'); |
|
8 | + debug_log('Using default WORKING_DIR = "'.WORKING_DIR.'"'); |
|
9 | 9 | } |
10 | 10 | |
11 | 11 | /** |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | **/ |
14 | 14 | function flushDir($dir) { |
15 | 15 | $files = glob("$dir/*"); |
16 | - foreach($files as $file) { |
|
16 | + foreach ($files as $file) { |
|
17 | 17 | if (is_dir($file)) { |
18 | 18 | flushDir($file); |
19 | 19 | rmdir($file); |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | } |
24 | 24 | |
25 | 25 | $hiddenFiles = glob("$dir/.*"); |
26 | - foreach($hiddenFiles as $hiddenFile) |
|
26 | + foreach ($hiddenFiles as $hiddenFile) |
|
27 | 27 | { |
28 | 28 | if (is_file($hiddenFile)) { |
29 | 29 | unlink($hiddenFile); |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | function getWorkingDir() |
63 | 63 | { |
64 | 64 | if ($GLOBALS['WORKING_DIR_FIRST_RUN']) { |
65 | - $GLOBALS['SESSION_WORKING_DIR'] = buildPath(WORKING_DIR, md5($_SERVER['REMOTE_ADDR'] . time())); |
|
65 | + $GLOBALS['SESSION_WORKING_DIR'] = buildPath(WORKING_DIR, md5($_SERVER['REMOTE_ADDR'].time())); |
|
66 | 66 | mkdir($GLOBALS['SESSION_WORKING_DIR']); |
67 | 67 | $GLOBALS['WORKING_DIR_FIRST_RUN'] = false; |
68 | 68 | } |
@@ -1,15 +1,15 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -require_once(__DIR__ . '/../config.inc.php'); |
|
4 | -require_once(APP_PATH . '/include/debug.inc.php'); |
|
3 | +require_once(__DIR__.'/../config.inc.php'); |
|
4 | +require_once(APP_PATH.'/include/debug.inc.php'); |
|
5 | 5 | |
6 | 6 | if (!defined('TOOL_NAME')) { |
7 | 7 | define('TOOL_NAME', 'Canvas API Tool'); |
8 | - debug_log('Using default TOOL_NAME = "' . TOOL_NAME . '"'); |
|
8 | + debug_log('Using default TOOL_NAME = "'.TOOL_NAME.'"'); |
|
9 | 9 | } |
10 | 10 | if (!defined('TOOL_START_PAGE')) { |
11 | 11 | define('TOOL_START_PAGE', $_SERVER['PHP_SELF']); |
12 | - debug_log('Using default TOOL_START_PAGE = "' . TOOL_START_PAGE . '"'); |
|
12 | + debug_log('Using default TOOL_START_PAGE = "'.TOOL_START_PAGE.'"'); |
|
13 | 13 | } |
14 | 14 | if (!defined('TOOL_START_LINK')) { |
15 | 15 | define('TOOL_START_LINK', 'Start Over'); |
@@ -21,20 +21,20 @@ discard block |
||
21 | 21 | function displayPage($content) { |
22 | 22 | echo '<html> |
23 | 23 | <head> |
24 | - <title>' . TOOL_NAME . '</title> |
|
24 | + <title>' . TOOL_NAME.'</title> |
|
25 | 25 | <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script> |
26 | - <script src="' . APP_URL . '/javascript/lightbox-2.6.min.js"></script> |
|
27 | - <link rel="stylesheet" href="' . APP_URL . '/css/lightbox.php" /> |
|
28 | - <link rel="stylesheet" href="' . APP_URL . '/css/script-ui.php" /> |
|
26 | + <script src="' . APP_URL.'/javascript/lightbox-2.6.min.js"></script> |
|
27 | + <link rel="stylesheet" href="' . APP_URL.'/css/lightbox.php" /> |
|
28 | + <link rel="stylesheet" href="' . APP_URL.'/css/script-ui.php" /> |
|
29 | 29 | </head> |
30 | 30 | <body>' . |
31 | -buildPageSection('<h1>' . TOOL_NAME . '</h1> |
|
32 | -<h2>' . SCHOOL_NAME . '</h2>', false, 'masthead') . |
|
33 | -buildPageSection('<a href="' . TOOL_START_PAGE . '">' . TOOL_START_LINK . '</a>', false, 'header') . |
|
34 | -'<div id="content-wrapper">' . |
|
35 | - buildPageSection($content, false, 'content') . |
|
36 | -'</div>' . |
|
37 | -buildPageSection('<a href="' . SCHOOL_URL .'">' . SCHOOL_NAME . '</a> • <a href="' . SCHOOL_DEPT_URL . '">' . SCHOOL_DEPT . '</a> • ' . SCHOOL_ADDRESS, false, 'footer') . ' |
|
31 | +buildPageSection('<h1>'.TOOL_NAME.'</h1> |
|
32 | +<h2>' . SCHOOL_NAME.'</h2>', false, 'masthead'). |
|
33 | +buildPageSection('<a href="'.TOOL_START_PAGE.'">'.TOOL_START_LINK.'</a>', false, 'header'). |
|
34 | +'<div id="content-wrapper">'. |
|
35 | + buildPageSection($content, false, 'content'). |
|
36 | +'</div>'. |
|
37 | +buildPageSection('<a href="'.SCHOOL_URL.'">'.SCHOOL_NAME.'</a> • <a href="'.SCHOOL_DEPT_URL.'">'.SCHOOL_DEPT.'</a> • '.SCHOOL_ADDRESS, false, 'footer').' |
|
38 | 38 | </body> |
39 | 39 | </html>'; |
40 | 40 | flush(); |
@@ -54,8 +54,8 @@ discard block |
||
54 | 54 | $id = md5($content); |
55 | 55 | } |
56 | 56 | $GLOBALS['PAGE_SECTIONS'][$id] = " |
57 | - <div id=\"$id\" class=\"page-section\">" . |
|
58 | - ($label ? "<h2>$label</h2>" : '') . " |
|
57 | + <div id=\"$id\" class=\"page-section\">". |
|
58 | + ($label ? "<h2>$label</h2>" : '')." |
|
59 | 59 | $content |
60 | 60 | </div> |
61 | 61 | "; |
@@ -71,21 +71,21 @@ discard block |
||
71 | 71 | define('DEBUGGING', DEBUGGING_DEFAULT); |
72 | 72 | } |
73 | 73 | if (!isset($debugLevel) || (isset($debugLevel) && (DEBUGGING & $debugLevel))) { |
74 | - $content = '<div class="error">' . ($title ? "<h3>$title</h3>" : '') . ($message ? "<p>$message</p>" : ''); |
|
74 | + $content = '<div class="error">'.($title ? "<h3>$title</h3>" : '').($message ? "<p>$message</p>" : ''); |
|
75 | 75 | if ($isList) { |
76 | 76 | $content .= '<dl>'; |
77 | 77 | if (array_keys($object) !== range(0, count($object) - 1)) { |
78 | - foreach($object as $term => $definition) { |
|
79 | - $content .= "<dt>$term</dt><dd><pre>" . print_r($definition, true) . '</pre></dd>'; |
|
78 | + foreach ($object as $term => $definition) { |
|
79 | + $content .= "<dt>$term</dt><dd><pre>".print_r($definition, true).'</pre></dd>'; |
|
80 | 80 | } |
81 | 81 | } else { |
82 | - foreach($object as $element) { |
|
83 | - $content .= '<dd><pre>' . print_r($element, true) . '</pre></dd>'; |
|
82 | + foreach ($object as $element) { |
|
83 | + $content .= '<dd><pre>'.print_r($element, true).'</pre></dd>'; |
|
84 | 84 | } |
85 | 85 | } |
86 | 86 | $content .= '</dl>'; |
87 | 87 | } else { |
88 | - $content .= '<pre>' . print_r($object, true) . '</pre>'; |
|
88 | + $content .= '<pre>'.print_r($object, true).'</pre>'; |
|
89 | 89 | } |
90 | 90 | $content .= '</div>'; |
91 | 91 | displayPage($content); |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -require_once(__DIR__ . '/../config.inc.php'); |
|
3 | +require_once(__DIR__.'/../config.inc.php'); |
|
4 | 4 | |
5 | 5 | define('DEBUGGING_NONE', 0); |
6 | 6 | |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | * Render a console-friendly version of the toolname |
33 | 33 | **/ |
34 | 34 | function getToolNameForConsole() { |
35 | - $toolNameForConsole = (defined('TOOL_NAME_ABBREVIATION') ? TOOL_NAME_ABBREVIATION :TOOL_NAME); |
|
35 | + $toolNameForConsole = (defined('TOOL_NAME_ABBREVIATION') ? TOOL_NAME_ABBREVIATION : TOOL_NAME); |
|
36 | 36 | |
37 | 37 | return str_replace( |
38 | 38 | array( |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | if (!isset($DEBUG_FLAG_TAG)) { |
68 | 68 | $DEBUG_FLAG_TAG = (isset($tag) ? $tag : time()); |
69 | 69 | } |
70 | - debug_log(getToolNameForConsole() . " $DEBUG_FLAG_TAG $message"); |
|
70 | + debug_log(getToolNameForConsole()." $DEBUG_FLAG_TAG $message"); |
|
71 | 71 | } |
72 | 72 | |
73 | 73 |
@@ -1,8 +1,8 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -require_once(__DIR__ . '/../config.inc.php'); |
|
4 | -require_once(APP_PATH . '/include/debug.inc.php'); |
|
5 | -require_once(APP_PATH . '/include/page-generator.inc.php'); |
|
3 | +require_once(__DIR__.'/../config.inc.php'); |
|
4 | +require_once(APP_PATH.'/include/debug.inc.php'); |
|
5 | +require_once(APP_PATH.'/include/page-generator.inc.php'); |
|
6 | 6 | |
7 | 7 | $MYSQL = new mysqli(MYSQL_HOST, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DATABASE); |
8 | 8 | function mysqlQuery($query) { |
@@ -25,8 +25,7 @@ discard block |
||
25 | 25 | 'Query' => $query, |
26 | 26 | 'Response' => ( |
27 | 27 | $response ? |
28 | - 'True' : |
|
29 | - mysqlError() |
|
28 | + 'True' : mysqlError() |
|
30 | 29 | ) |
31 | 30 | ), |
32 | 31 | true, |