Completed
Branch master (c3ca5f)
by Seth
04:51
created
phpicalendar/lib/bennu/iCalendar_properties.php 1 patch
Spacing   +86 added lines, -86 removed lines patch added patch discarded remove patch
@@ -37,12 +37,12 @@  discard block
 block discarded – undo
37 37
     // IMPORTANT: the parameter name MUST BE CAPITALIZED!
38 38
     function is_valid_parameter($parameter, $value) {
39 39
 
40
-        if(is_array($value)) {
41
-            if(!iCalendar_parameter::multiple_values_allowed($parameter)) {
40
+        if (is_array($value)) {
41
+            if (!iCalendar_parameter::multiple_values_allowed($parameter)) {
42 42
                 return false;
43 43
             }
44
-            foreach($value as $item) {
45
-                if(!iCalendar_parameter::is_valid_value($this, $parameter, $item)) {
44
+            foreach ($value as $item) {
45
+                if (!iCalendar_parameter::is_valid_value($this, $parameter, $item)) {
46 46
                     return false;
47 47
                 }
48 48
             }
@@ -59,13 +59,13 @@  discard block
 block discarded – undo
59 59
     // If some property is very picky about its values, it should do the work itself
60 60
     // Only data type validation is done here
61 61
     function is_valid_value($value) {
62
-        if(is_array($value)) {
63
-            if(!$this->val_multi) {
62
+        if (is_array($value)) {
63
+            if (!$this->val_multi) {
64 64
                 return false;
65 65
             }
66 66
             else {
67
-                foreach($value as $oneval) {
68
-                    if(!rfc2445_is_valid_value($oneval, $this->val_type)) {
67
+                foreach ($value as $oneval) {
68
+                    if (!rfc2445_is_valid_value($oneval, $this->val_type)) {
69 69
                         return false;
70 70
                     }
71 71
                 }
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
     }
81 81
 
82 82
     function set_parent_component($componentname) {
83
-        if(class_exists('iCalendar_'.strtolower(substr($componentname, 1)))) {
83
+        if (class_exists('iCalendar_'.strtolower(substr($componentname, 1)))) {
84 84
             $this->parent_component = strtoupper($componentname);
85 85
             return true;
86 86
         }
@@ -89,10 +89,10 @@  discard block
 block discarded – undo
89 89
     }
90 90
 
91 91
     function set_value($value) {
92
-        if($this->is_valid_value($value)) {
92
+        if ($this->is_valid_value($value)) {
93 93
             // This transparently formats any value type according to the iCalendar specs
94
-            if(is_array($value)) {
95
-                foreach($value as $key => $item) {
94
+            if (is_array($value)) {
95
+                foreach ($value as $key => $item) {
96 96
                     $value[$key] = rfc2445_do_value_formatting($item, $this->val_type);
97 97
                 }
98 98
                 $this->value = implode(',', $value);
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
         $valarray = array_map($replace_function, $valarray);
116 116
 
117 117
         // Now, if this property cannot have multiple values, don't return as an array
118
-        if(!$this->val_multi) {
118
+        if (!$this->val_multi) {
119 119
             return $valarray[0];
120 120
         }
121 121
 
@@ -131,21 +131,21 @@  discard block
 block discarded – undo
131 131
 
132 132
         // Are we trying to add a valid parameter?
133 133
         $xname = false;
134
-        if(!isset($this->valid_parameters[$name])) {
134
+        if (!isset($this->valid_parameters[$name])) {
135 135
             // If not, is it an x-name as per RFC 2445?
136
-            if(!rfc2445_is_xname($name)) {
136
+            if (!rfc2445_is_xname($name)) {
137 137
                 return false;
138 138
             }
139 139
             // No more checks -- all components are supposed to allow x-name parameters
140 140
             $xname = true;
141 141
         }
142 142
 
143
-        if(!$this->is_valid_parameter($name, $value)) {
143
+        if (!$this->is_valid_parameter($name, $value)) {
144 144
             return false;
145 145
         }
146 146
 
147
-        if(is_array($value)) {
148
-            foreach($value as $key => $element) {
147
+        if (is_array($value)) {
148
+            foreach ($value as $key => $element) {
149 149
                 $value[$key] = iCalendar_parameter::do_value_formatting($name, $element);
150 150
             }
151 151
         }
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 
158 158
         // Special case: if we just changed the VALUE parameter, reflect this
159 159
         // in the object's status so that it only accepts correct type values
160
-        if($name == 'VALUE') {
160
+        if ($name == 'VALUE') {
161 161
             // TODO: what if this invalidates an already-set value?
162 162
             $this->val_type = constant('RFC2445_TYPE_'.str_replace('-', '_', $value));
163 163
         }
@@ -171,11 +171,11 @@  discard block
 block discarded – undo
171 171
         // Uppercase
172 172
         $name = strtoupper($name);
173 173
 
174
-        if(isset($this->parameters[$name])) {
174
+        if (isset($this->parameters[$name])) {
175 175
             // If there are any double quotes in the value, invisibly strip them
176
-            if(is_array($this->parameters[$name])) {
177
-                foreach($this->parameters[$name] as $key => $value) {
178
-                    if(substr($value, 0, 1) == '"') {
176
+            if (is_array($this->parameters[$name])) {
177
+                foreach ($this->parameters[$name] as $key => $value) {
178
+                    if (substr($value, 0, 1) == '"') {
179 179
                        $this->parameters[$name][$key] = substr($value, 1, strlen($value) - 2);
180 180
                     }
181 181
                 }
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
             }
184 184
 
185 185
             else {
186
-                if(substr($this->parameters[$name], 0, 1) == '"') {
186
+                if (substr($this->parameters[$name], 0, 1) == '"') {
187 187
                     return substr($this->parameters[$name], 1, strlen($this->parameters[$name]) - 2);
188 188
                 }
189 189
             }
@@ -195,10 +195,10 @@  discard block
 block discarded – undo
195 195
     function serialize() {
196 196
         $string = $this->name;
197 197
 
198
-        if(!empty($this->parameters)) {
199
-            foreach($this->parameters as $name => $value) {
198
+        if (!empty($this->parameters)) {
199
+            foreach ($this->parameters as $name => $value) {
200 200
                 $string .= ';'.$name.'=';
201
-                if(is_array($value)) {
201
+                if (is_array($value)) {
202 202
                     $string .= implode(',', $value);
203 203
                 }
204 204
                 else {
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
 
210 210
         $string .= ':'.$this->value;
211 211
 
212
-        return rfc2445_fold($string) . RFC2445_CRLF;
212
+        return rfc2445_fold($string).RFC2445_CRLF;
213 213
     }
214 214
 }
215 215
 
@@ -302,10 +302,10 @@  discard block
 block discarded – undo
302 302
     }
303 303
 
304 304
     function invariant_holds() {
305
-        if(isset($this->parameters['ENCODING']) && !isset($this->parameters['VALUE'])) {
305
+        if (isset($this->parameters['ENCODING']) && !isset($this->parameters['VALUE'])) {
306 306
             return false;
307 307
         }
308
-        if(isset($this->parameters['VALUE']) && !isset($this->parameters['ENCODING'])) {
308
+        if (isset($this->parameters['VALUE']) && !isset($this->parameters['ENCODING'])) {
309 309
             return false;
310 310
         }
311 311
 
@@ -316,15 +316,15 @@  discard block
 block discarded – undo
316 316
 
317 317
         $parameter = strtoupper($parameter);
318 318
 
319
-        if(!parent::is_valid_parameter($parameter, $value)) {
319
+        if (!parent::is_valid_parameter($parameter, $value)) {
320 320
             return false;
321 321
         }
322 322
 
323
-        if($parameter === 'ENCODING' && strtoupper($value) != 'BASE64') {
323
+        if ($parameter === 'ENCODING' && strtoupper($value) != 'BASE64') {
324 324
             return false;
325 325
         }
326 326
 
327
-        if($parameter === 'VALUE' && strtoupper($value) != 'BINARY') {
327
+        if ($parameter === 'VALUE' && strtoupper($value) != 'BINARY') {
328 328
             return false;
329 329
         }
330 330
 
@@ -407,12 +407,12 @@  discard block
 block discarded – undo
407 407
 
408 408
     function is_valid_value($value) {
409 409
         // This MUST be two floats separated by a semicolon
410
-        if(!is_string($value)) {
410
+        if (!is_string($value)) {
411 411
             return false;
412 412
         }
413 413
 
414 414
         $floats = explode(';', $value);
415
-        if(count($floats) != 2) {
415
+        if (count($floats) != 2) {
416 416
             return false;
417 417
         }
418 418
 
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
422 422
     function set_value($value) {
423 423
         // Must override this, otherwise the semicolon separating
424 424
         // the two floats would get auto-quoted, which is illegal
425
-        if($this->is_valid_value($value)) {
425
+        if ($this->is_valid_value($value)) {
426 426
             $this->value = $value;
427 427
             return true;
428 428
         }
@@ -458,7 +458,7 @@  discard block
 block discarded – undo
458 458
 
459 459
     function is_valid_value($value) {
460 460
         // Only integers between 0 and 100 inclusive allowed
461
-        if(!parent::is_valid_value($value)) {
461
+        if (!parent::is_valid_value($value)) {
462 462
             return false;
463 463
         }
464 464
         $value = intval($value);
@@ -479,7 +479,7 @@  discard block
 block discarded – undo
479 479
 
480 480
     function is_valid_value($value) {
481 481
         // Only integers between 0 and 9 inclusive allowed        
482
-        if(!parent::is_valid_value($value)) {
482
+        if (!parent::is_valid_value($value)) {
483 483
             return false;
484 484
         }
485 485
 
@@ -561,7 +561,7 @@  discard block
 block discarded – undo
561 561
     }
562 562
 
563 563
     function is_valid_value($value) {
564
-        if(!parent::is_valid_value($value)) {
564
+        if (!parent::is_valid_value($value)) {
565 565
             return false;
566 566
         }
567 567
         // Time MUST be in UTC format
@@ -583,12 +583,12 @@  discard block
 block discarded – undo
583 583
     }
584 584
 
585 585
     function is_valid_value($value) {
586
-        if(!parent::is_valid_value($value)) {
586
+        if (!parent::is_valid_value($value)) {
587 587
             return false;
588 588
         }
589 589
 
590 590
         // If present in a FREEBUSY component, must be in UTC format
591
-        if($this->parent_component == 'VFREEBUSY' && substr($value, -1) != 'Z') {
591
+        if ($this->parent_component == 'VFREEBUSY' && substr($value, -1) != 'Z') {
592 592
             return false;
593 593
         }
594 594
 
@@ -600,10 +600,10 @@  discard block
 block discarded – undo
600 600
 
601 601
         $parameter = strtoupper($parameter);
602 602
 
603
-        if(!parent::is_valid_parameter($parameter, $value)) {
603
+        if (!parent::is_valid_parameter($parameter, $value)) {
604 604
             return false;
605 605
         }
606
-        if($parameter == 'VALUE' && !($value == 'DATE' || $value == 'DATE-TIME')) {
606
+        if ($parameter == 'VALUE' && !($value == 'DATE' || $value == 'DATE-TIME')) {
607 607
             return false;
608 608
         }
609 609
 
@@ -625,12 +625,12 @@  discard block
 block discarded – undo
625 625
     }
626 626
 
627 627
     function is_valid_value($value) {
628
-        if(!parent::is_valid_value($value)) {
628
+        if (!parent::is_valid_value($value)) {
629 629
             return false;
630 630
         }
631 631
 
632 632
         // If present in a FREEBUSY component, must be in UTC format
633
-        if($this->parent_component == 'VFREEBUSY' && substr($value, -1) != 'Z') {
633
+        if ($this->parent_component == 'VFREEBUSY' && substr($value, -1) != 'Z') {
634 634
             return false;
635 635
         }
636 636
 
@@ -642,10 +642,10 @@  discard block
 block discarded – undo
642 642
 
643 643
         $parameter = strtoupper($parameter);
644 644
 
645
-        if(!parent::is_valid_parameter($parameter, $value)) {
645
+        if (!parent::is_valid_parameter($parameter, $value)) {
646 646
             return false;
647 647
         }
648
-        if($parameter == 'VALUE' && !($value == 'DATE' || $value == 'DATE-TIME')) {
648
+        if ($parameter == 'VALUE' && !($value == 'DATE' || $value == 'DATE-TIME')) {
649 649
             return false;
650 650
         }
651 651
 
@@ -669,12 +669,12 @@  discard block
 block discarded – undo
669 669
     // TODO: unimplemented stuff when parent is a VTIMEZONE component
670 670
 
671 671
     function is_valid_value($value) {
672
-        if(!parent::is_valid_value($value)) {
672
+        if (!parent::is_valid_value($value)) {
673 673
             return false;
674 674
         }
675 675
 
676 676
         // If present in a FREEBUSY component, must be in UTC format
677
-        if($this->parent_component == 'VFREEBUSY' && substr($value, -1) != 'Z') {
677
+        if ($this->parent_component == 'VFREEBUSY' && substr($value, -1) != 'Z') {
678 678
             return false;
679 679
         }
680 680
 
@@ -685,10 +685,10 @@  discard block
 block discarded – undo
685 685
 
686 686
         $parameter = strtoupper($parameter);
687 687
 
688
-        if(!parent::is_valid_parameter($parameter, $value)) {
688
+        if (!parent::is_valid_parameter($parameter, $value)) {
689 689
             return false;
690 690
         }
691
-        if($parameter == 'VALUE' && !($value == 'DATE' || $value == 'DATE-TIME')) {
691
+        if ($parameter == 'VALUE' && !($value == 'DATE' || $value == 'DATE-TIME')) {
692 692
             return false;
693 693
         }
694 694
 
@@ -708,7 +708,7 @@  discard block
 block discarded – undo
708 708
     }
709 709
 
710 710
     function is_valid_value($value) {
711
-        if(!parent::is_valid_value($value)) {
711
+        if (!parent::is_valid_value($value)) {
712 712
             return false;
713 713
         }
714 714
 
@@ -731,16 +731,16 @@  discard block
 block discarded – undo
731 731
     }
732 732
 
733 733
     function is_valid_value($value) {
734
-        if(!parent::is_valid_value($value)) {
734
+        if (!parent::is_valid_value($value)) {
735 735
             return false;
736 736
         }
737 737
 
738 738
         $pos = strpos($value, '/'); // We know there's only one / in there
739
-        if($value{$pos - 1} != 'Z') {
739
+        if ($value{$pos - 1} != 'Z') {
740 740
             // Start time MUST be in UTC
741 741
             return false;
742 742
         }
743
-        if($value{$pos + 1} != 'P' && $substr($value, -1) != 'Z') {
743
+        if ($value{$pos + 1} != 'P' && $substr($value, -1) != 'Z') {
744 744
             // If the second part is not a period, it MUST be in UTC
745 745
             return false;
746 746
         }
@@ -800,11 +800,11 @@  discard block
 block discarded – undo
800 800
     }
801 801
 
802 802
     function set_parent_component($componentname) {
803
-        if(!parent::set_parent_component($componentname)) {
803
+        if (!parent::set_parent_component($componentname)) {
804 804
             return false;
805 805
         }
806 806
 
807
-        if($this->parent_component == 'VFREEBUSY' || $this->parent_component == 'VALARM') {
807
+        if ($this->parent_component == 'VFREEBUSY' || $this->parent_component == 'VALARM') {
808 808
             // Most parameters become invalid in this case, the full allowed set is now:
809 809
             $this->valid_parameters = array(
810 810
                 'LANGUAGE'       => RFC2445_OPTIONAL | RFC2445_ONCE,
@@ -888,10 +888,10 @@  discard block
 block discarded – undo
888 888
 
889 889
         $parameter = strtoupper($parameter);
890 890
 
891
-        if(!parent::is_valid_parameter($parameter, $value)) {
891
+        if (!parent::is_valid_parameter($parameter, $value)) {
892 892
             return false;
893 893
         }
894
-        if($parameter == 'VALUE' && !($value == 'DATE' || $value == 'DATE-TIME')) {
894
+        if ($parameter == 'VALUE' && !($value == 'DATE' || $value == 'DATE-TIME')) {
895 895
             return false;
896 896
         }
897 897
 
@@ -964,10 +964,10 @@  discard block
 block discarded – undo
964 964
 
965 965
         $parameter = strtoupper($parameter);
966 966
 
967
-        if(!parent::is_valid_parameter($parameter, $value)) {
967
+        if (!parent::is_valid_parameter($parameter, $value)) {
968 968
             return false;
969 969
         }
970
-        if($parameter == 'VALUE' && !($value == 'DATE' || $value == 'DATE-TIME')) {
970
+        if ($parameter == 'VALUE' && !($value == 'DATE' || $value == 'DATE-TIME')) {
971 971
             return false;
972 972
         }
973 973
 
@@ -1005,10 +1005,10 @@  discard block
 block discarded – undo
1005 1005
 
1006 1006
         $parameter = strtoupper($parameter);
1007 1007
 
1008
-        if(!parent::is_valid_parameter($parameter, $value)) {
1008
+        if (!parent::is_valid_parameter($parameter, $value)) {
1009 1009
             return false;
1010 1010
         }
1011
-        if($parameter == 'VALUE' && !($value == 'DATE' || $value == 'DATE-TIME' || $value == 'PERIOD')) {
1011
+        if ($parameter == 'VALUE' && !($value == 'DATE' || $value == 'DATE-TIME' || $value == 'PERIOD')) {
1012 1012
             return false;
1013 1013
         }
1014 1014
 
@@ -1045,7 +1045,7 @@  discard block
 block discarded – undo
1045 1045
     }
1046 1046
 
1047 1047
     function is_valid_value($value) {
1048
-        if(!parent::is_valid_value($value)) {
1048
+        if (!parent::is_valid_value($value)) {
1049 1049
             return false;
1050 1050
         }
1051 1051
         // Time MUST be in UTC format
@@ -1065,7 +1065,7 @@  discard block
 block discarded – undo
1065 1065
     }
1066 1066
 
1067 1067
     function is_valid_value($value) {
1068
-        if(!parent::is_valid_value($value)) {
1068
+        if (!parent::is_valid_value($value)) {
1069 1069
             return false;
1070 1070
         }
1071 1071
         // Time MUST be in UTC format
@@ -1085,7 +1085,7 @@  discard block
 block discarded – undo
1085 1085
     }
1086 1086
 
1087 1087
     function is_valid_value($value) {
1088
-        if(!parent::is_valid_value($value)) {
1088
+        if (!parent::is_valid_value($value)) {
1089 1089
             return false;
1090 1090
         }
1091 1091
         // Time MUST be in UTC format
@@ -1106,7 +1106,7 @@  discard block
 block discarded – undo
1106 1106
     }
1107 1107
 
1108 1108
     function is_valid_value($value) {
1109
-        if(!parent::is_valid_value($value)) {
1109
+        if (!parent::is_valid_value($value)) {
1110 1110
             return false;
1111 1111
         }
1112 1112
         $value = intval($value);
@@ -1133,7 +1133,7 @@  discard block
 block discarded – undo
1133 1133
 
1134 1134
         $name = strtoupper($name);
1135 1135
 
1136
-        if(rfc2445_is_xname($name)) {
1136
+        if (rfc2445_is_xname($name)) {
1137 1137
             $this->name = $name;
1138 1138
             return true;
1139 1139
         }
@@ -1160,7 +1160,7 @@  discard block
 block discarded – undo
1160 1160
     }
1161 1161
 
1162 1162
     function is_valid_value($value) {
1163
-        if(!is_string($value) || empty($value)) {
1163
+        if (!is_string($value) || empty($value)) {
1164 1164
             return false;
1165 1165
         }
1166 1166
 
@@ -1169,8 +1169,8 @@  discard block
 block discarded – undo
1169 1169
         $from  = 0;
1170 1170
         $escch = false;
1171 1171
 
1172
-        for($i = 0; $i < $len; ++$i) {
1173
-            if($value{$i} == ';' && !$escch) {
1172
+        for ($i = 0; $i < $len; ++$i) {
1173
+            if ($value{$i} == ';' && !$escch) {
1174 1174
                 // Token completed
1175 1175
                 $parts[] = substr($value, $from, $i - $from);
1176 1176
                 $from = $i + 1;
@@ -1186,34 +1186,34 @@  discard block
 block discarded – undo
1186 1186
         $count = count($parts);
1187 1187
 
1188 1188
         // May have 2 or 3 tokens (last one is optional)
1189
-        if($count != 2 && $count != 3) {
1189
+        if ($count != 2 && $count != 3) {
1190 1190
             return false;
1191 1191
         }
1192 1192
 
1193 1193
         // REMEMBER: if ANY part is empty, we have an illegal value
1194 1194
 
1195 1195
         // First token must be hierarchical numeric status (3 levels max)
1196
-        if(strlen($parts[0]) == 0) {
1196
+        if (strlen($parts[0]) == 0) {
1197 1197
             return false;
1198 1198
         }
1199 1199
 
1200
-        if($parts[0]{0} < '1' || $parts[0]{0} > '4') {
1200
+        if ($parts[0]{0} < '1' || $parts[0]{0} > '4') {
1201 1201
             return false;
1202 1202
         }
1203 1203
 
1204 1204
         $len = strlen($parts[0]);
1205 1205
 
1206 1206
         // Max 3 levels, and can't end with a period
1207
-        if($len > 5 || $parts[0]{$len - 1} == '.') {
1207
+        if ($len > 5 || $parts[0]{$len - 1} == '.') {
1208 1208
             return false;
1209 1209
         }
1210 1210
 
1211
-        for($i = 1; $i < $len; ++$i) {
1212
-            if(($i & 1) == 1 && $parts[0]{$i} != '.') {
1211
+        for ($i = 1; $i < $len; ++$i) {
1212
+            if (($i & 1) == 1 && $parts[0]{$i} != '.') {
1213 1213
                 // Even-indexed chars must be periods
1214 1214
                 return false;
1215 1215
             }
1216
-            else if(($i & 1) == 0 && ($parts[0]{$i} < '0' || $parts[0]{$i} > '9')) {
1216
+            else if (($i & 1) == 0 && ($parts[0]{$i} < '0' || $parts[0]{$i} > '9')) {
1217 1217
                 // Odd-indexed chars must be numbers
1218 1218
                 return false;
1219 1219
             }
@@ -1223,25 +1223,25 @@  discard block
 block discarded – undo
1223 1223
         // they are not allowed to have UNESCAPED semicolons, commas, slashes,
1224 1224
         // or any newlines at all
1225 1225
 
1226
-        for($i = 1; $i < $count; ++$i) {
1227
-            if(strpos($parts[$i], "\n") !== false) {
1226
+        for ($i = 1; $i < $count; ++$i) {
1227
+            if (strpos($parts[$i], "\n") !== false) {
1228 1228
                 return false;
1229 1229
             }
1230 1230
 
1231 1231
             $len = strlen($parts[$i]);
1232
-            if($len == 0) {
1232
+            if ($len == 0) {
1233 1233
                 // Cannot be empty
1234 1234
                 return false;
1235 1235
             }
1236 1236
 
1237 1237
             $parts[$i] .= '#'; // This guard token saves some conditionals in the loop
1238 1238
 
1239
-            for($j = 0; $j < $len; ++$j) {
1239
+            for ($j = 0; $j < $len; ++$j) {
1240 1240
                 $thischar = $parts[$i]{$j};
1241 1241
                 $nextchar = $parts[$i]{$j + 1};
1242
-                if($thischar == '\\') {
1242
+                if ($thischar == '\\') {
1243 1243
                     // Next char must now be one of ";,\nN"
1244
-                    if($nextchar != ';' && $nextchar != ',' && $nextchar != '\\' &&
1244
+                    if ($nextchar != ';' && $nextchar != ',' && $nextchar != '\\' &&
1245 1245
                        $nextchar != 'n' && $nextchar != 'N') {
1246 1246
                         return false;
1247 1247
                     }
@@ -1250,7 +1250,7 @@  discard block
 block discarded – undo
1250 1250
                     ++$j;
1251 1251
                     continue;
1252 1252
                 }
1253
-                if($thischar == ';' || $thischar == ',' || $thischar == '\\') {
1253
+                if ($thischar == ';' || $thischar == ',' || $thischar == '\\') {
1254 1254
                     // This wasn't escaped as it should
1255 1255
                     return false;
1256 1256
                 }
@@ -1262,7 +1262,7 @@  discard block
 block discarded – undo
1262 1262
 
1263 1263
     function set_value($value) {
1264 1264
         // Must override this, otherwise the value would be quoted again
1265
-        if($this->is_valid_value($value)) {
1265
+        if ($this->is_valid_value($value)) {
1266 1266
             $this->value = $value;
1267 1267
             return true;
1268 1268
         }
Please login to merge, or discard this patch.
phpicalendar/calendars/publish.php 1 patch
Spacing   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -78,9 +78,9 @@  discard block
 block discarded – undo
78 78
 
79 79
 // allow/disallow publishing
80 80
 $phpicalendar_publishing = isset($phpiCal_config->phpicalendar_publishing) ? $phpiCal_config->phpicalendar_publishing : 0;
81
-define( 'PHPICALENDAR_PUBLISHING', $phpicalendar_publishing );
81
+define('PHPICALENDAR_PUBLISHING', $phpicalendar_publishing);
82 82
 // only allow publishing if explicitly enabled
83
-if(PHPICALENDAR_PUBLISHING != 1) {
83
+if (PHPICALENDAR_PUBLISHING != 1) {
84 84
 	header('WWW-Authenticate: Basic realm="ERROR: Calendar Publishing is disabled on this server"');
85 85
 	header('HTTP/1.1 401 Unauthorized');
86 86
 	echo 'Calendar Publishing is disabled on this server!';
@@ -89,15 +89,15 @@  discard block
 block discarded – undo
89 89
 
90 90
 // set calendar path, or just use current directory...make sure there's a trailing slash
91 91
 if (isset($phpiCal_config->calendar_path) && $phpiCal_config->calendar_path != '') {
92
-	if (substr($phpiCal_config->calendar_path, -1, 1) !='/') $calendar_path = $calendar_path.'/';
92
+	if (substr($phpiCal_config->calendar_path, -1, 1) != '/') $calendar_path = $calendar_path.'/';
93 93
 } else {
94 94
 	$calendar_path = '';
95 95
 }
96 96
 
97 97
 // toggle logging
98
-define( 'PHPICALENDAR_LOG_PUBLISHING', 1 );
99
-if(defined('PHPICALENDAR_LOG_PUBLISHING') && PHPICALENDAR_LOG_PUBLISHING == 1) {
100
-	if( ! $logfile = fopen('publish_log.txt','a+') ) {
98
+define('PHPICALENDAR_LOG_PUBLISHING', 1);
99
+if (defined('PHPICALENDAR_LOG_PUBLISHING') && PHPICALENDAR_LOG_PUBLISHING == 1) {
100
+	if (!$logfile = fopen('publish_log.txt', 'a+')) {
101 101
 		header('HTTP/1.1 401 Unauthorized');
102 102
 		header('WWW-Authenticate: Basic realm="ERROR: Unable to open log file"');
103 103
 		echo 'Unable to open log file.';
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 	// Require authentication 
111 111
 	if (isset($_SERVER['HTTP_AUTHORIZATION'])) {
112 112
 		list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'])
113
-			= explode( ':', base64_decode( substr($_SERVER['HTTP_AUTHORIZATION'], 6) ) );
113
+			= explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
114 114
 	}
115 115
 	if (!isset($_SERVER['PHP_AUTH_USER'])) {
116 116
 		header('WWW-Authenticate: Basic realm="phpICalendar"');
@@ -127,17 +127,17 @@  discard block
 block discarded – undo
127 127
 	}
128 128
 }
129 129
 
130
-switch ($_SERVER['REQUEST_METHOD']){
130
+switch ($_SERVER['REQUEST_METHOD']) {
131 131
 	// unpublishing
132 132
 	case 'DELETE':
133 133
 		// get calendar filename
134
-		$calendar_file = $calendar_path.substr($_SERVER['REQUEST_URI'] , ( strrpos($_SERVER['REQUEST_URI'], '/') + 1) ) ;
134
+		$calendar_file = $calendar_path.substr($_SERVER['REQUEST_URI'], (strrpos($_SERVER['REQUEST_URI'], '/') + 1));
135 135
 		$calendar_file = urldecode($calendar_file);
136 136
 		logmsg('received request to delete '.$calendar_file);
137 137
 		// remove calendar file
138
-		if(!unlink($calendar_file)){
138
+		if (!unlink($calendar_file)) {
139 139
 			logmsg('unable to delete the calendar file');
140
-		}else{
140
+		} else {
141 141
 			logmsg('deleted');
142 142
 		}
143 143
 		break;
@@ -146,43 +146,43 @@  discard block
 block discarded – undo
146 146
 		logmsg('PUT request');
147 147
 		// get calendar data
148 148
 		# php://input allows you to read raw POST data
149
-		if($datain = fopen('php://input','r')){
150
-			while(!@feof($datain)){
151
-				$data .= fgets($datain,4096);
149
+		if ($datain = fopen('php://input', 'r')) {
150
+			while (!@feof($datain)) {
151
+				$data .= fgets($datain, 4096);
152 152
 			}
153 153
 			@fclose($datain);
154
-		}else{
154
+		} else {
155 155
 			logmsg('unable to read input data');
156 156
 		}
157
-		if(isset($data)){
157
+		if (isset($data)) {
158 158
 			if (isset($_SERVER['PATH_INFO'])) {
159
-				preg_match("/\/([\w\-\.\+ ]*).ics/i",$_SERVER['PATH_INFO'],$matches);
159
+				preg_match("/\/([\w\-\.\+ ]*).ics/i", $_SERVER['PATH_INFO'], $matches);
160 160
 				$calendar_name = urldecode($matches[1]);
161 161
 			}
162 162
 			// If we don't have it from path info, use the supplied calendar name
163
-			if( ! isset($calendar_name) ) {
164
-				$cal_arr = explode("\n",$data);
165
-				foreach($cal_arr as $k => $v){
166
-					if(strstr($v,'X-WR-CALNAME:')){
167
-						$arr = explode(':',$v);
163
+			if (!isset($calendar_name)) {
164
+				$cal_arr = explode("\n", $data);
165
+				foreach ($cal_arr as $k => $v) {
166
+					if (strstr($v, 'X-WR-CALNAME:')) {
167
+						$arr = explode(':', $v);
168 168
 						$calendar_name = trim($arr[1]);
169 169
 						break;
170 170
 					}
171 171
 				}
172 172
 			}
173
-			logmsg('Received request to update: ' . $calendar_name);
173
+			logmsg('Received request to update: '.$calendar_name);
174 174
 			// Remove any invalid characters from the filename
175
-			$calendar_name = preg_replace( "/[^\w\.\- ]/", '', $calendar_name );
176
-			if( ( ! isset($calendar_name) ) || ( $calendar_name == '' ) ) {
175
+			$calendar_name = preg_replace("/[^\w\.\- ]/", '', $calendar_name);
176
+			if ((!isset($calendar_name)) || ($calendar_name == '')) {
177 177
 				header('HTTP/1.1 401 Invalid calendar name');
178 178
 				header('WWW-Authenticate: Basic realm="ERROR: Invalid calendar name."');
179 179
 				echo 'Invalid calendar name.';
180 180
 			}
181 181
 			// If we don't have a name, assume default
182 182
 			$calendar_name = isset($calendar_name) ? $calendar_name : 'default';
183
-			logmsg('Updating calendar: ' . $calendar_name);
183
+			logmsg('Updating calendar: '.$calendar_name);
184 184
 			// If this is Apple iCal, an event with a blank summary is private - mark as such
185
-			if( preg_match( "/Apple.*iCal/", $_SERVER['HTTP_USER_AGENT'] ) ) {
185
+			if (preg_match("/Apple.*iCal/", $_SERVER['HTTP_USER_AGENT'])) {
186 186
 				$data = preg_replace(
187 187
 					"/^\s*SUMMARY:\s*$/m",
188 188
 					"SUMMARY: **PRIVATE**\nCLASS:PRIVATE",
@@ -190,34 +190,34 @@  discard block
 block discarded – undo
190 190
 				);
191 191
 			}
192 192
 			// write to file
193
-			if($dataout = fopen($calendar_path.$calendar_name.'.ics','w+')){
194
-				fputs($dataout, $data, strlen($data) );
193
+			if ($dataout = fopen($calendar_path.$calendar_name.'.ics', 'w+')) {
194
+				fputs($dataout, $data, strlen($data));
195 195
 				@fclose($dataout);
196
-			}else{
197
-				logmsg( 'could not open file '.$calendar_path.$calendar_name.'.ics' );
196
+			} else {
197
+				logmsg('could not open file '.$calendar_path.$calendar_name.'.ics');
198 198
 			}
199 199
 
200
-		}else {
200
+		} else {
201 201
 			logmsg('PUT ERROR - No data supplied.');
202 202
 		}
203 203
 		break;
204 204
 	case 'GET':
205 205
 		if (isset($_SERVER['PATH_INFO'])) {
206
-			preg_match("/\/([ A-Za-z0-9._]*).ics/i",$_SERVER['PATH_INFO'],$matches);
206
+			preg_match("/\/([ A-Za-z0-9._]*).ics/i", $_SERVER['PATH_INFO'], $matches);
207 207
 			$icsfile = urldecode($matches[1]);
208 208
 	
209 209
 			// get calendar data
210
-			if (file_exists($calendar_path . $icsfile . '.ics') &&
211
-				is_readable($calendar_path . $icsfile . '.ics') &&
212
-				is_file($calendar_path . $icsfile . '.ics')
210
+			if (file_exists($calendar_path.$icsfile.'.ics') &&
211
+				is_readable($calendar_path.$icsfile.'.ics') &&
212
+				is_file($calendar_path.$icsfile.'.ics')
213 213
 			) {
214
-				echo file_get_contents($calendar_path . $icsfile . '.ics');
215
-				logmsg('downloaded calendar ' . $icsfile);
214
+				echo file_get_contents($calendar_path.$icsfile.'.ics');
215
+				logmsg('downloaded calendar '.$icsfile);
216 216
 			}
217 217
 		}
218 218
 }
219 219
 
220
-if(defined('PHPICALENDAR_LOG_PUBLISHING') && PHPICALENDAR_LOG_PUBLISHING == 1) {
220
+if (defined('PHPICALENDAR_LOG_PUBLISHING') && PHPICALENDAR_LOG_PUBLISHING == 1) {
221 221
 	fclose($logfile);
222 222
 }
223 223
 
@@ -226,18 +226,18 @@  discard block
 block discarded – undo
226 226
 
227 227
 
228 228
 // for logging
229
-function logmsg($str){
229
+function logmsg($str) {
230 230
 	global $logfile;
231 231
 
232
-	if(defined('PHPICALENDAR_LOG_PUBLISHING') && PHPICALENDAR_LOG_PUBLISHING == 1) {
233
-		if( $_SERVER['PHP_AUTH_USER'] )
234
-			$user =  $_SERVER['PHP_AUTH_USER'];
232
+	if (defined('PHPICALENDAR_LOG_PUBLISHING') && PHPICALENDAR_LOG_PUBLISHING == 1) {
233
+		if ($_SERVER['PHP_AUTH_USER'])
234
+			$user = $_SERVER['PHP_AUTH_USER'];
235 235
 		else
236
-			$user =  $_SERVER['REMOTE_USER'];
236
+			$user = $_SERVER['REMOTE_USER'];
237 237
 
238
-		$logline = date('Y-m-d H:i:s ') . $_SERVER['REMOTE_ADDR'] . ' ' . $user . ' ' . $str . "\n";
238
+		$logline = date('Y-m-d H:i:s ').$_SERVER['REMOTE_ADDR'].' '.$user.' '.$str."\n";
239 239
 
240
-		fputs($logfile, $logline, strlen($logline) );
240
+		fputs($logfile, $logline, strlen($logline));
241 241
 	}
242 242
 }
243 243
 ?>
244 244
\ No newline at end of file
Please login to merge, or discard this patch.
phpicalendar/caldav.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -1,17 +1,17 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 define('BASE', './');
3
-require_once(BASE . 'functions/init.inc.php');
4
-require_once(BASE . 'functions/calendar_functions.php');
3
+require_once(BASE.'functions/init.inc.php');
4
+require_once(BASE.'functions/calendar_functions.php');
5 5
 
6 6
 //require_once(BASE . 'lib/HTTP/WebDAV/Server.php');
7 7
 require_once('/home/jablko/public_html/gallery2/modules/webdav/lib/HTTP/WebDAV/Server.php');
8
-require_once(BASE . 'lib/HTTP/CalDAV/Server.php');
8
+require_once(BASE.'lib/HTTP/CalDAV/Server.php');
9 9
 
10
-require_once(BASE . 'lib/bennu/bennu.class.php');
11
-require_once(BASE . 'lib/bennu/iCalendar_components.php');
12
-require_once(BASE . 'lib/bennu/iCalendar_parameters.php');
13
-require_once(BASE . 'lib/bennu/iCalendar_properties.php');
14
-require_once(BASE . 'lib/bennu/iCalendar_rfc2445.php');
10
+require_once(BASE.'lib/bennu/bennu.class.php');
11
+require_once(BASE.'lib/bennu/iCalendar_components.php');
12
+require_once(BASE.'lib/bennu/iCalendar_parameters.php');
13
+require_once(BASE.'lib/bennu/iCalendar_properties.php');
14
+require_once(BASE.'lib/bennu/iCalendar_rfc2445.php');
15 15
 
16 16
 class HTTP_CalDAV_Server_PHPiCalendar extends HTTP_CalDAV_Server {
17 17
 	function getBasePath() {
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 	}
70 70
 
71 71
 	function delete($options) {
72
-		$absolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath() .  '/' .
72
+		$absolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath().'/'.
73 73
 			$options['path'];
74 74
 		if (!file_exists($absolutePath)) {
75 75
 			return '404 Not Found';
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 	}
80 80
 
81 81
 	function get(&$options) {
82
-		$absolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath() . '/' .
82
+		$absolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath().'/'.
83 83
 			$options['path'];
84 84
 
85 85
 		if (!file_exists($absolutePath)) {
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 			return '502 Bad Gateway';
112 112
 		}
113 113
 
114
-		$absolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath() . '/' .
114
+		$absolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath().'/'.
115 115
 			$options['path'];
116 116
 
117 117
 		if (!file_exists($absolutePath)) {
@@ -122,8 +122,8 @@  discard block
 block discarded – undo
122 122
 			return '400 Bad Request';
123 123
 		}
124 124
 
125
-		$newAbsolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath() .
126
-			'/' . $options['dest'];
125
+		$newAbsolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath().
126
+			'/'.$options['dest'];
127 127
 		if (!is_dir(dirname($newAbsolutePath))) {
128 128
 			return '409 Conflict';
129 129
 		}
@@ -158,8 +158,8 @@  discard block
 block discarded – undo
158 158
 			$file = array();
159 159
 			$file['path'] = $path;
160 160
 
161
-			$absolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath() .
162
-				'/' . $path;
161
+			$absolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath().
162
+				'/'.$path;
163 163
 			$stat = stat($absolutePath);
164 164
 			$file['props'] = array();
165 165
 			$file['props'][] = $this->mkprop('creationdate', $stat['ctime']);
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
 	}
198 198
 
199 199
 	function put(&$options) {
200
-		$absolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath() . '/' .
200
+		$absolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath().'/'.
201 201
 			$options['path'];
202 202
 		if (!is_dir(dirname($absolutePath))) {
203 203
 			return '409 Conflict';
@@ -221,8 +221,8 @@  discard block
 block discarded – undo
221 221
 			$file = array();
222 222
 			$file['path'] = $path;
223 223
 
224
-			$absolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath() .
225
-				'/' . $path;
224
+			$absolutePath = HTTP_CalDAV_Server_PHPiCalendar::getBasePath().
225
+				'/'.$path;
226 226
 			$stat = stat($absolutePath);
227 227
 			$file['props'] = array();
228 228
 			$file['props'][] = $this->mkprop('creationdate', $stat['ctime']);
Please login to merge, or discard this patch.
phpicalendar/year.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -5,20 +5,20 @@  discard block
 block discarded – undo
5 5
 require_once(BASE.'functions/list_functions.php');
6 6
 require_once(BASE.'functions/template.php');
7 7
 
8
-ereg ("([0-9]{4})([0-9]{2})([0-9]{2})", $getdate, $day_array2);
9
-$this_day 	= $day_array2[3]; 
8
+ereg("([0-9]{4})([0-9]{2})([0-9]{2})", $getdate, $day_array2);
9
+$this_day = $day_array2[3]; 
10 10
 $this_month = $day_array2[2];
11 11
 $this_year 	= $day_array2[1];
12
-$next_year 	= strtotime ("+1 year", strtotime($getdate));
13
-$next_year 	= date ("Ymd", $next_year);
14
-$prev_year 	= strtotime ("-1 year", strtotime($getdate));
15
-$prev_year 	= date ("Ymd", $prev_year);
12
+$next_year 	= strtotime("+1 year", strtotime($getdate));
13
+$next_year 	= date("Ymd", $next_year);
14
+$prev_year 	= strtotime("-1 year", strtotime($getdate));
15
+$prev_year 	= date("Ymd", $prev_year);
16 16
 
17
-$sidebar_date 		= localizeDate($dateFormat_week_list, strtotime($getdate));
17
+$sidebar_date = localizeDate($dateFormat_week_list, strtotime($getdate));
18 18
 
19 19
 // For the side months
20
-ereg ("([0-9]{4})([0-9]{2})([0-9]{2})", $getdate, $day_array2);
21
-$this_day 	= $day_array2[3]; 
20
+ereg("([0-9]{4})([0-9]{2})([0-9]{2})", $getdate, $day_array2);
21
+$this_day = $day_array2[3]; 
22 22
 $this_month = $day_array2[2];
23 23
 $this_year 	= $day_array2[1];
24 24
 
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 $available		= availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED);
27 27
 $list_icals 	= display_ical_list($available);
28 28
 $list_years 	= list_years();
29
-$list_months 	= list_months();
29
+$list_months = list_months();
30 30
 $list_weeks 	= list_weeks();
31 31
 $list_jumps 	= list_jumps();
32 32
 $list_calcolors = '<img src="templates/'.$template.'/images/allday_dot.gif" alt=" " width="11" height="10" border="0" />'.$lang['l_all_day'].'<br>
Please login to merge, or discard this patch.
phpicalendar/month.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -15,41 +15,41 @@
 block discarded – undo
15 15
 		break;
16 16
 }
17 17
 
18
-$unix_time 				= strtotime($getdate);
19
-$today_today 			= date('Ymd', time() + $phpiCal_config->second_offset); 
20
-$tomorrows_date 		= date('Ymd', strtotime("+1 day",  $unix_time));
21
-$yesterdays_date 		= date('Ymd', strtotime("-1 day",  $unix_time));
22
-$sidebar_date 			= localizeDate($dateFormat_week_list, $unix_time);
18
+$unix_time = strtotime($getdate);
19
+$today_today = date('Ymd', time() + $phpiCal_config->second_offset); 
20
+$tomorrows_date = date('Ymd', strtotime("+1 day", $unix_time));
21
+$yesterdays_date = date('Ymd', strtotime("-1 day", $unix_time));
22
+$sidebar_date = localizeDate($dateFormat_week_list, $unix_time);
23 23
 if (!isset($style_select)) $style_select = '';
24 24
 
25 25
 // find out next month
26
-$next_month_month 		= ($this_month+1 == '13') ? '1' : ($this_month+1);
27
-$next_month_day 		= $this_day;
28
-$next_month_year 		= ($next_month_month == '1') ? ($this_year+1) : $this_year;
29
-while (!checkdate($next_month_month,$next_month_day,$next_month_year)) $next_month_day--;
30
-$next_month_time 		= mktime(0,0,0,$next_month_month,$next_month_day,$next_month_year);
26
+$next_month_month = ($this_month + 1 == '13') ? '1' : ($this_month + 1);
27
+$next_month_day = $this_day;
28
+$next_month_year 		= ($next_month_month == '1') ? ($this_year + 1) : $this_year;
29
+while (!checkdate($next_month_month, $next_month_day, $next_month_year)) $next_month_day--;
30
+$next_month_time 		= mktime(0, 0, 0, $next_month_month, $next_month_day, $next_month_year);
31 31
 
32 32
 // find out last month
33
-$prev_month_month 		= ($this_month-1 == '0') ? '12' : ($this_month-1);
34
-$prev_month_day 		= $this_day;
35
-$prev_month_year 		= ($prev_month_month == '12') ? ($this_year-1) : $this_year;
36
-while (!checkdate($prev_month_month,$prev_month_day,$prev_month_year)) $prev_month_day--;
37
-$prev_month_time 		= mktime(0,0,0,$prev_month_month,$prev_month_day,$prev_month_year);
33
+$prev_month_month = ($this_month - 1 == '0') ? '12' : ($this_month - 1);
34
+$prev_month_day = $this_day;
35
+$prev_month_year 		= ($prev_month_month == '12') ? ($this_year - 1) : $this_year;
36
+while (!checkdate($prev_month_month, $prev_month_day, $prev_month_year)) $prev_month_day--;
37
+$prev_month_time 		= mktime(0, 0, 0, $prev_month_month, $prev_month_day, $prev_month_year);
38 38
 
39 39
 $next_month 			= date("Ymd", $next_month_time);
40 40
 $prev_month 			= date("Ymd", $prev_month_time);
41
-$display_date 			= localizeDate ($dateFormat_month, $unix_time);
42
-$parse_month 			= date ("Ym", $unix_time);
43
-$first_of_month 		= $this_year.$this_month."01";
41
+$display_date = localizeDate($dateFormat_month, $unix_time);
42
+$parse_month = date("Ym", $unix_time);
43
+$first_of_month = $this_year.$this_month."01";
44 44
 $start_month_day 		= dateOfWeek($first_of_month, $phpiCal_config->week_start_day);
45
-$thisday2 				= localizeDate($dateFormat_week_list, $unix_time);
45
+$thisday2 = localizeDate($dateFormat_week_list, $unix_time);
46 46
 $num_of_events2 			= 0;
47 47
 
48 48
 // select for calendars
49
-$available		= availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED);
49
+$available = availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED);
50 50
 $list_icals 	= display_ical_list($available);
51 51
 $list_years 	= list_years();
52
-$list_months 	= list_months();
52
+$list_months = list_months();
53 53
 $list_weeks 	= list_weeks();
54 54
 $list_jumps 	= list_jumps();
55 55
 $list_calcolors = list_calcolors();
Please login to merge, or discard this patch.
phpicalendar/week.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -18,21 +18,21 @@  discard block
 block discarded – undo
18 18
 $starttime 			= "0500";
19 19
 $weekstart 			= 1;
20 20
 $unix_time 			= strtotime($getdate);
21
-$today_today        = date('Ymd', time() + $phpiCal_config->second_offset); 
22
-$next_week 			= date("Ymd", strtotime("+1 week",  $unix_time));
23
-$prev_week 			= date("Ymd", strtotime("-1 week",  $unix_time));
24
-$next_day			= date('Ymd', strtotime("+1 day",  $unix_time));
25
-$prev_day 			= date('Ymd', strtotime("-1 day",  $unix_time));
26
-$start_week_time 	= strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
27
-$end_week_time 		= $start_week_time + (($phpiCal_config->week_length - 1) * 25 * 60 * 60);
28
-$start_week 		= localizeDate($dateFormat_week, $start_week_time);
29
-$end_week 			= localizeDate($dateFormat_week, $end_week_time);
21
+$today_today = date('Ymd', time() + $phpiCal_config->second_offset); 
22
+$next_week 			= date("Ymd", strtotime("+1 week", $unix_time));
23
+$prev_week 			= date("Ymd", strtotime("-1 week", $unix_time));
24
+$next_day = date('Ymd', strtotime("+1 day", $unix_time));
25
+$prev_day = date('Ymd', strtotime("-1 day", $unix_time));
26
+$start_week_time = strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
27
+$end_week_time = $start_week_time + (($phpiCal_config->week_length - 1)*25*60*60);
28
+$start_week = localizeDate($dateFormat_week, $start_week_time);
29
+$end_week = localizeDate($dateFormat_week, $end_week_time);
30 30
 $display_date 		= "$start_week - $end_week";
31 31
 $sidebar_date 		= localizeDate($dateFormat_week_list, $unix_time);
32 32
 
33 33
 // For the side months
34
-ereg ("([0-9]{4})([0-9]{2})([0-9]{2})", $getdate, $day_array2);
35
-$this_day 	= $day_array2[3]; 
34
+ereg("([0-9]{4})([0-9]{2})([0-9]{2})", $getdate, $day_array2);
35
+$this_day = $day_array2[3]; 
36 36
 $this_month = $day_array2[2];
37 37
 $this_year 	= $day_array2[1];
38 38
 
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 $available		= availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED);
41 41
 $list_icals 	= display_ical_list($available);
42 42
 $list_years 	= list_years();
43
-$list_months 	= list_months();
43
+$list_months = list_months();
44 44
 $list_weeks 	= list_weeks();
45 45
 $list_jumps 	= list_jumps();
46 46
 $list_calcolors = list_calcolors();
Please login to merge, or discard this patch.
phpicalendar/admin/index.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -8,10 +8,10 @@  discard block
 block discarded – undo
8 8
 #echo "<pre>";print_r($_REQUEST);
9 9
 
10 10
 if (empty($phpiCal_config->default_path)) {
11
-	if (isset($_SERVER['HTTPS']) || strtolower($_SERVER['HTTPS']) == 'on' ) {
12
-		$default_path = 'https://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'],'/admin/'));
11
+	if (isset($_SERVER['HTTPS']) || strtolower($_SERVER['HTTPS']) == 'on') {
12
+		$default_path = 'https://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].substr($_SERVER['PHP_SELF'], 0, strpos($_SERVER['PHP_SELF'], '/admin/'));
13 13
 	} else {
14
-		$default_path = 'http://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'],'/admin/'));
14
+		$default_path = 'http://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].substr($_SERVER['PHP_SELF'], 0, strpos($_SERVER['PHP_SELF'], '/admin/'));
15 15
 	}
16 16
 }
17 17
 #if ($phpiCal_config->allow_admin != 'yes') {
@@ -39,29 +39,29 @@  discard block
 block discarded – undo
39 39
 	}
40 40
 	
41 41
 	if (isset($username) && @$_GET['action'] != 'logout') {
42
-		$is_loged_in = login ($username, $password);
42
+		$is_loged_in = login($username, $password);
43 43
 	}
44 44
 }
45 45
 
46 46
 $login_good = ($is_loged_in) ? '' : 'oops';
47
-$login_bad	= ((!$is_loged_in) && (@$_GET['action'] == 'login')) ? 'oops' : '';
47
+$login_bad = ((!$is_loged_in) && (@$_GET['action'] == 'login')) ? 'oops' : '';
48 48
 $delete_msg = '';
49
-$addupdate_msg 	= '';
50
-if(is_loggedin()){
49
+$addupdate_msg = '';
50
+if (is_loggedin()) {
51 51
 	// Delete a calendar
52 52
 	// Not at all secure - need to strip out path info if used by users besides admin in the future
53 53
 	if (isset($_POST['action']) && $_POST['action'] == 'delete') {
54 54
 		foreach ($_POST['delete_calendar'] as $filename) {
55 55
 			if (!delete_cal(urldecode($filename))) {
56
-				$delete_msg = $delete_msg . '<font color="red">' . $lang['l_delete_error'] . ' ' . urldecode(substr($filename,0,-4)) . '</font><br />';
56
+				$delete_msg = $delete_msg.'<font color="red">'.$lang['l_delete_error'].' '.urldecode(substr($filename, 0, -4)).'</font><br />';
57 57
 			} else {
58
-				$delete_msg = $delete_msg . '<font color="green">' . urldecode(substr($filename,0,-4)) . ' ' . $lang['l_delete_success'] . '</font><br />';
58
+				$delete_msg = $delete_msg.'<font color="green">'.urldecode(substr($filename, 0, -4)).' '.$lang['l_delete_success'].'</font><br />';
59 59
 			}
60 60
 		}
61 61
 	}
62 62
 	
63 63
 	// Add or Update a calendar
64
-	if (isset($_POST['action'])  && $_POST['action'] == 'addupdate') {
64
+	if (isset($_POST['action']) && $_POST['action'] == 'addupdate') {
65 65
 		for ($filenumber = 1; $filenumber < 6; $filenumber++) {
66 66
 			$file = $_FILES['calfile'];
67 67
 			$addupdate_success = FALSE;
@@ -71,15 +71,15 @@  discard block
 block discarded – undo
71 71
 			} elseif (!is_uploaded_ics($file['name'][$filenumber])) {
72 72
 				$upload_error = $upload_error_type_lang;
73 73
 			} elseif (!copy_cal($file['tmp_name'][$filenumber], $file['name'][$filenumber])) {
74
-				$upload_error = $copy_error_lang . " " . $file['tmp_name'][$filenumber] . " - " . $calendar_path . "/" . $file['name'][$filenumber];
74
+				$upload_error = $copy_error_lang." ".$file['tmp_name'][$filenumber]." - ".$calendar_path."/".$file['name'][$filenumber];
75 75
 			} else {
76 76
 				$addupdate_success = TRUE;
77 77
 			}
78 78
 			
79 79
 			if ($addupdate_success == TRUE) {
80
-				$addupdate_msg = $addupdate_msg . '<font color="green">'.$lang['l_cal_file'].' #'.$filenumber.': '.$lang['l_action_success'].'</font><br />';
80
+				$addupdate_msg = $addupdate_msg.'<font color="green">'.$lang['l_cal_file'].' #'.$filenumber.': '.$lang['l_action_success'].'</font><br />';
81 81
 			} else {
82
-				$addupdate_msg = $addupdate_msg . '<font color="red">'.$lang['l_cal_file'].' #'.$filenumber.': '.$lang['l_upload_error'].'</font><br />';
82
+				$addupdate_msg = $addupdate_msg.'<font color="red">'.$lang['l_cal_file'].' #'.$filenumber.': '.$lang['l_upload_error'].'</font><br />';
83 83
 			}
84 84
 		}
85 85
 	}
Please login to merge, or discard this patch.
phpicalendar/languages/spanish.inc.php 1 patch
Spacing   +78 added lines, -78 removed lines patch added patch discarded remove patch
@@ -7,27 +7,27 @@  discard block
 block discarded – undo
7 7
 // Translation by Luis Fernando Rocha ([email protected])
8 8
 //
9 9
 
10
-$lang['l_day'] 			= 'D&iacute;a';
10
+$lang['l_day'] = 'D&iacute;a';
11 11
 $lang['l_week'] 			= 'Semana';
12
-$lang['l_month'] 			= 'Mes';
12
+$lang['l_month'] = 'Mes';
13 13
 $lang['l_year'] 			= 'A&ntilde;o';
14 14
 $lang['l_calendar'] 		= 'Calendario';
15 15
 $lang['l_next_day'] 		= 'D&iacute;a siguiente';
16
-$lang['l_next_month'] 		= 'Mes siguiente';
16
+$lang['l_next_month'] = 'Mes siguiente';
17 17
 $lang['l_next_week'] 		= 'Semana siguiente';
18 18
 $lang['l_next_year'] 		= 'A&ntilde;o siguiente';
19
-$lang['l_last_day'] 		= 'D&iacute;a anterior';
20
-$lang['l_last_month'] 		= 'Mes anterior';
19
+$lang['l_last_day'] = 'D&iacute;a anterior';
20
+$lang['l_last_month'] = 'Mes anterior';
21 21
 $lang['l_last_week'] 		= 'Semana anterior';
22 22
 $lang['l_last_year'] 		= 'A&ntilde;o anterior';
23 23
 $lang['l_subscribe'] 		= 'Suscribir';
24
-$lang['l_download'] 		= 'Descargar';
25
-$lang['l_powered_by'] 		= 'Operaci&oacute;n por';  // Changed
26
-$lang['l_event'] 			= 'Evento';
24
+$lang['l_download'] = 'Descargar';
25
+$lang['l_powered_by'] = 'Operaci&oacute;n por'; // Changed
26
+$lang['l_event'] = 'Evento';
27 27
 $lang['l_event_start'] 		= 'Inicio';
28
-$lang['l_event_end'] 		= 'Fin';
28
+$lang['l_event_end'] = 'Fin';
29 29
 $lang['l_this_months'] 		= 'Eventos de este mes';
30
-$lang['l_date'] 			= 'Fecha';
30
+$lang['l_date'] = 'Fecha';
31 31
 $lang['l_summary'] 		= 'Descripci&oacute;n';
32 32
 $lang['l_all_day'] 		= 'todo el d&iacute;a';
33 33
 $lang['l_notes'] 			= 'Notas';
@@ -35,75 +35,75 @@  discard block
 block discarded – undo
35 35
 $lang['l_today'] 			= 'Hoy';
36 36
 $lang['l_this_week'] 		= 'Esta semana';
37 37
 $lang['l_this_month'] 		= 'Este mes';
38
-$lang['l_jump'] 			= 'Ir a';
38
+$lang['l_jump'] = 'Ir a';
39 39
 $lang['l_tomorrows'] 		= 'Eventos de ma&ntilde;ana';
40
-$lang['l_goday'] 			= 'Ir a Hoy';
40
+$lang['l_goday'] = 'Ir a Hoy';
41 41
 $lang['l_goweek'] 			= 'Ir a esta semana';
42 42
 $lang['l_gomonth'] 			= 'Ir a este Mes';
43 43
 $lang['l_goyear'] 			= 'Ir a este A&ntilde;o';
44 44
 $lang['l_search'] 			= 'Buscar'; // the verb
45 45
 $lang['l_results'] 			= 'Resultados de la b&uacute;squeda';
46
-$lang['l_pick_multiple'] 	= 'Seleccionar multiples';  // Changed
47
-$lang['l_query'] 			= 'Consulta: '; // will be followed by the search query
48
-$lang['l_no_results'] 		= 'Ning&uacute;n evento encontrado';
46
+$lang['l_pick_multiple'] = 'Seleccionar multiples'; // Changed
47
+$lang['l_query'] = 'Consulta: '; // will be followed by the search query
48
+$lang['l_no_results'] = 'Ning&uacute;n evento encontrado';
49 49
 $lang['l_goprint'] 		= 'Formato de impresi&oacute;n';
50
-$lang['l_time'] 			= 'Hora';
50
+$lang['l_time'] = 'Hora';
51 51
 $lang['l_summary'] 		= 'Resumen';
52 52
 $lang['l_description'] 		= 'Descripci&oacute;n';
53 53
 $lang['l_this_site_is']		= 'Esta p&aacute;gina es';
54 54
 $lang['l_no_events_day']	= 'No hay eventos para hoy.';
55 55
 $lang['l_no_events_week']	= 'No hay eventos para esta semana.';
56 56
 $lang['l_no_events_month']	= 'No hay eventos para este mes.';
57
-$lang['l_rss_day_date']		= 'g:i A';  // Lists just the time
58
-$lang['l_rss_week_date	']	= '%e de %b';  // Lists just the day
59
-$lang['l_rss_month_date	']	= '%e de %b';  // Lists just the day
57
+$lang['l_rss_day_date']		= 'g:i A'; // Lists just the time
58
+$lang['l_rss_week_date	']	= '%e de %b'; // Lists just the day
59
+$lang['l_rss_month_date	']	= '%e de %b'; // Lists just the day
60 60
 $lang['l_rss_language']		= 'es-es';
61
-$lang['l_search_took']		= 'La busqeda tard&oacute; %s segundos';
61
+$lang['l_search_took'] = 'La busqeda tard&oacute; %s segundos';
62 62
 $lang['l_recurring_event']	= 'Evento peri&ocaute;dico';
63
-$lang['l_exception']		= 'Excepci&oacute;n';
64
-$lang['l_no_query']		= 'falta la consulta';
63
+$lang['l_exception'] = 'Excepci&oacute;n';
64
+$lang['l_no_query'] = 'falta la consulta';
65 65
 $lang['l_preferences']		= 'Preferencias';
66
-$lang['l_printer']		= 'Impresora';
67
-$lang['l_select_lang']		= 'Escoja su idioma principal:';  // Changed
68
-$lang['l_select_cal']		= 'Escoja su calendario principal:';  // Changed
69
-$lang['l_select_view']		= 'Elija su vista por defecto:';  // Changed
70
-$lang['l_select_time']		= 'Elija su hora de inicio principal:';  // Changed
71
-$lang['l_select_day']		= 'Escoja d&aacute;a para iniciar semana:';  // Changed
72
-$lang['l_select_style']		= 'Seleccione su estilo principal:';  // Changed
66
+$lang['l_printer'] = 'Impresora';
67
+$lang['l_select_lang']		= 'Escoja su idioma principal:'; // Changed
68
+$lang['l_select_cal']		= 'Escoja su calendario principal:'; // Changed
69
+$lang['l_select_view']		= 'Elija su vista por defecto:'; // Changed
70
+$lang['l_select_time']		= 'Elija su hora de inicio principal:'; // Changed
71
+$lang['l_select_day']		= 'Escoja d&aacute;a para iniciar semana:'; // Changed
72
+$lang['l_select_style'] = 'Seleccione su estilo principal:'; // Changed
73 73
 $lang['l_set_prefs']		= 'Guardar preferencias';
74
-$lang['l_completed_date']	= 'Finalizado el';
74
+$lang['l_completed_date'] = 'Finalizado el';
75 75
 $lang['l_completed']		= 'Finalizado';
76
-$lang['l_created']			= 'Creado:';
77
-$lang['l_due']				= 'Fecha limite:';
76
+$lang['l_created'] = 'Creado:';
77
+$lang['l_due'] = 'Fecha limite:';
78 78
 $lang['l_priority']			= 'Prioridad:';
79 79
 $lang['l_priority_high']	= 'Alta';
80 80
 $lang['l_priority_low']		= 'Baja';
81
-$lang['l_priority_medium']	= 'Media';
81
+$lang['l_priority_medium'] = 'Media';
82 82
 $lang['l_priority_none']	= 'Ninguna';
83
-$lang['l_status']			= 'Estado';
84
-$lang['l_status_confirmed'] = 'CONFIRMADO' ;   // Changed
85
-$lang['l_status_cancelled'] = 'CANCELADO';   // Changed
86
-$lang['l_status_tentative'] = 'PENDIENTE';   // Changed
87
-$lang['l_todo']			= 'Por hacer';
83
+$lang['l_status'] = 'Estado';
84
+$lang['l_status_confirmed'] = 'CONFIRMADO'; // Changed
85
+$lang['l_status_cancelled'] = 'CANCELADO'; // Changed
86
+$lang['l_status_tentative'] = 'PENDIENTE'; // Changed
87
+$lang['l_todo'] = 'Por hacer';
88 88
 $lang['l_unfinished']		= 'Sin terminar';
89 89
 $lang['l_prefs_set'] 		= 'Sus preferencias han sido guardadas.';
90 90
 $lang['l_prefs_unset'] 		= 'Preferencias no activas. Los cambios se activaran al recargar la p&aacute;gina.';
91 91
 $lang['l_unset_prefs'] 		= 'Preferencias sin activar:';
92
-$lang['l_organizer']		= 'Organizador';
92
+$lang['l_organizer'] = 'Organizador';
93 93
 $lang['l_attendee']		= 'Participante';
94 94
 $lang['l_location']		= 'Lugar';
95
-$lang['l_admin_header']		= 'Administraci&oacute;n de PHP iCalendar';
95
+$lang['l_admin_header'] = 'Administraci&oacute;n de PHP iCalendar';
96 96
 $lang['l_username']			= 'Usuario';
97 97
 $lang['l_password']			= 'Contrase&ntilde;a';
98
-$lang['l_login']			= 'Registro';
98
+$lang['l_login'] = 'Registro';
99 99
 $lang['l_invalid_login']	= 'Usuario o contrase&ntilde;a incorrectos.';
100 100
 $lang['l_addupdate_cal']	= 'Agregar o actualizar un calendario';
101
-$lang['l_addupdate_desc']	= 'Agrega un calendario, enviando un archivo nuevo. Actualiza un calendario reemplazandolo con un archivo con el mismo nombre.';
102
-$lang['l_delete_cal']		= 'Borra un calendario';
103
-$lang['l_logout']			= 'Salir';
104
-$lang['l_cal_file']		= 'Archivo de Calendario';
105
-$lang['l_php_error']		= 'Error PHP';
106
-$upload_error_gen_lang		= 'Hubo un problema con su env&iacute;o.';
101
+$lang['l_addupdate_desc'] = 'Agrega un calendario, enviando un archivo nuevo. Actualiza un calendario reemplazandolo con un archivo con el mismo nombre.';
102
+$lang['l_delete_cal'] = 'Borra un calendario';
103
+$lang['l_logout'] = 'Salir';
104
+$lang['l_cal_file'] = 'Archivo de Calendario';
105
+$lang['l_php_error'] = 'Error PHP';
106
+$upload_error_gen_lang = 'Hubo un problema con su env&iacute;o.';
107 107
 $upload_error_lang[0]		= 'Hubo un problema con su env&iacute;o.';
108 108
 $upload_error_lang[1]		= 'El archivo que intenta enviar es demasiado grande.';
109 109
 $upload_error_lang[2]		= 'El archivo que intenta enviar es demasiado grande.';
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 $upload_error_lang[4]		= 'Debe elegir un archivo para enviar.';
112 112
 $lang['l_upload_error_type'] = 'Solo se aceptan archivos de calendario (.ics).';
113 113
 $lang['l_copy_error']		= 'Fall&oacute; la copia del archivo';
114
-$lang['l_delete_error']		= 'Fall&oacute; el borrado del archivo';
114
+$lang['l_delete_error'] = 'Fall&oacute; el borrado del archivo';
115 115
 $lang['l_delete_success']	= 'fue borrado exitosamente.';
116 116
 $lang['l_action_success']	= 'Su acci&oacute;n se realiz&oacute; con &eacute;xito.';
117 117
 $lang['l_submit']			= 'Enviar';
@@ -122,48 +122,48 @@  discard block
 block discarded – undo
122 122
 $lang['l_legend']			= 'Leyenda';
123 123
 $lang['l_admin_subhead']	= 'Administra los calendarios desde esta p&aacute;gina';
124 124
 $lang['l_prefs_subhead']	= 'Establece una cookie por vistar este sitio';
125
-$lang['l_rss_info']			= 'Informaci&oacute;n sobre RSS';
126
-$lang['l_rss_subhead']		= 'Fuentes RSS b&aacute;sicas estan disponibles para cada calendario';
127
-$lang['l_rss_notenabled']	= 'RSS no est&aacute; disponible en este sitio';
125
+$lang['l_rss_info'] = 'Informaci&oacute;n sobre RSS';
126
+$lang['l_rss_subhead'] = 'Fuentes RSS b&aacute;sicas estan disponibles para cada calendario';
127
+$lang['l_rss_notenabled'] = 'RSS no est&aacute; disponible en este sitio';
128 128
 
129 129
 // - navigation
130 130
 $lang['l_back'] 		= 'Atr&aacute;s';
131 131
 $lang['l_next'] 		= 'Siguiente';
132 132
 $lang['l_prev'] 		= 'Anterior';
133
-$lang['l_day_view'] 	= 'Vista diaria';
133
+$lang['l_day_view'] = 'Vista diaria';
134 134
 $lang['l_week_view'] 	= 'Vista semanal';
135
-$lang['l_month_view'] 	= 'Vista mensual';
135
+$lang['l_month_view'] = 'Vista mensual';
136 136
 $lang['l_year_view'] 	= 'Vista anual';
137 137
 
138 138
 // ---------------------------------
139 139
 
140 140
 
141 141
 // $format_recur, items enclosed in % will be substituted with variables
142
-$format_recur_lang['delimiter']	= ', ';							// ie, 'one, two, three'
142
+$format_recur_lang['delimiter'] = ', '; // ie, 'one, two, three'
143 143
 
144
-$format_recur_lang['yearly']		= array('a&ntilde;o','a&ntilde;os');		// for these, put singular
145
-$format_recur_lang['monthly']		= array('mes','meses');					// and plural forms
146
-$format_recur_lang['weekly']		= array('semana','semanas');				// these will be %freq%
147
-$format_recur_lang['daily']		= array('d&iacute;a','dias');				// in the replacement below
148
-$format_recur_lang['hourly']		= array('hora','horas');
149
-$format_recur_lang['minutely']		= array('minuto','minutos');
150
-$format_recur_lang['secondly']		= array('segundo','segundos');
144
+$format_recur_lang['yearly']		= array('a&ntilde;o', 'a&ntilde;os'); // for these, put singular
145
+$format_recur_lang['monthly'] = array('mes', 'meses'); // and plural forms
146
+$format_recur_lang['weekly']		= array('semana', 'semanas'); // these will be %freq%
147
+$format_recur_lang['daily'] = array('d&iacute;a', 'dias'); // in the replacement below
148
+$format_recur_lang['hourly']		= array('hora', 'horas');
149
+$format_recur_lang['minutely']		= array('minuto', 'minutos');
150
+$format_recur_lang['secondly']		= array('segundo', 'segundos');
151 151
 
152
-$format_recur_lang['start']			= 'Cada %int% %freq% %for%';		// ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5'
153
-$format_recur_lang['until']			= 'hasta %date%';				// ie, 'until January 4'
154
-$format_recur_lang['count']			= 'durante %int% veces';		// ie, 'for 5 times'
152
+$format_recur_lang['start']			= 'Cada %int% %freq% %for%'; // ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5'
153
+$format_recur_lang['until']			= 'hasta %date%'; // ie, 'until January 4'
154
+$format_recur_lang['count']			= 'durante %int% veces'; // ie, 'for 5 times'
155 155
 
156
-$format_recur_lang['bymonth']		= 'En los meses: %list%';			// ie, 'In months: January, February, March'
157
-$format_recur_lang['bymonthday']	= 'En los dias: %list%';			// ie, 'On dates: 1, 2, 3, 4'
158
-$format_recur_lang['byday']		= 'En los dias de la semana: %list%';	// ie, 'On days: Mon, Tues, Wed, Thurs'
156
+$format_recur_lang['bymonth'] = 'En los meses: %list%'; // ie, 'In months: January, February, March'
157
+$format_recur_lang['bymonthday'] = 'En los dias: %list%'; // ie, 'On dates: 1, 2, 3, 4'
158
+$format_recur_lang['byday'] = 'En los dias de la semana: %list%'; // ie, 'On days: Mon, Tues, Wed, Thurs'
159 159
 
160 160
 // ---------------------------------
161 161
 
162
-$daysofweek_lang			= array ('Domingo','Lunes','Martes','Mi&eacute;rcoles','Jueves','Viernes','S&aacute;bado');
163
-$daysofweekshort_lang		= array ('Dom','Lun','Mar','Mie','Jue','Vie','Sab');
164
-$daysofweekreallyshort_lang	= array ('D','L','M','X','J','V','S');
165
-$monthsofyear_lang		= array ('Enero','Febrero','Marzo','Abril','Mayo','Junio','Julio','Agosto','Septiembre','Octubre','Noviembre','Diciembre');
166
-$monthsofyearshort_lang		= array ('Ene','Feb','Mar','Abr','May','Jun','Jul','Ago','Sep','Oct','Nov','Dic');
162
+$daysofweek_lang = array('Domingo', 'Lunes', 'Martes', 'Mi&eacute;rcoles', 'Jueves', 'Viernes', 'S&aacute;bado');
163
+$daysofweekshort_lang = array('Dom', 'Lun', 'Mar', 'Mie', 'Jue', 'Vie', 'Sab');
164
+$daysofweekreallyshort_lang = array('D', 'L', 'M', 'X', 'J', 'V', 'S');
165
+$monthsofyear_lang = array('Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', 'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre');
166
+$monthsofyearshort_lang = array('Ene', 'Feb', 'Mar', 'Abr', 'May', 'Jun', 'Jul', 'Ago', 'Sep', 'Oct', 'Nov', 'Dic');
167 167
 
168 168
 // For time formatting, check out: http://www.php.net/manual/en/function.date.php
169 169
 $timeFormat = 'g:i A';
@@ -197,13 +197,13 @@  discard block
 block discarded – undo
197 197
 // Error messages - %s will be replaced with a variable
198 198
 $lang['l_error_title'] 			= '&iexcl;Error!';
199 199
 $lang['l_error_window'] 		= '&iexcl;Hubo un error!';
200
-$lang['l_error_calendar'] 		= 'Cuando se produjo este error, se procesaba "%s" del calendario.';
200
+$lang['l_error_calendar'] = 'Cuando se produjo este error, se procesaba "%s" del calendario.';
201 201
 $lang['l_error_path'] 			= 'Incapaz de abrir la ruta a: "%s"';
202 202
 $lang['l_error_back'] 			= 'Por favor, use el bot&oacute;n "Atr&aacute;s" para volver.';
203
-$lang['l_error_remotecal'] 		= 'Este servidor bloquea calendarios remotos que no han sido aprobados.';
204
-$lang['l_error_restrictedcal'] 	= 'Usted ha intentado accesar un calendario restringido en este servidor.';  // Changed
205
-$lang['l_error_invalidcal'] 		= 'Archivo de calendario inv&aacute;lido. Por favor, pruebe con otro calendario.';
206
-$lang['l_error_cantopen'] 		= 'Incapaz de abrir el calendario.';  // Changed
207
-$lang['l_error_cache']			= 'Incapaz de escribir al directorio de memoria. Verifique su configuraci&oacute;.';  // Changed
203
+$lang['l_error_remotecal'] = 'Este servidor bloquea calendarios remotos que no han sido aprobados.';
204
+$lang['l_error_restrictedcal'] = 'Usted ha intentado accesar un calendario restringido en este servidor.'; // Changed
205
+$lang['l_error_invalidcal'] = 'Archivo de calendario inv&aacute;lido. Por favor, pruebe con otro calendario.';
206
+$lang['l_error_cantopen'] = 'Incapaz de abrir el calendario.'; // Changed
207
+$lang['l_error_cache'] = 'Incapaz de escribir al directorio de memoria. Verifique su configuraci&oacute;.'; // Changed
208 208
 
209 209
 ?>
Please login to merge, or discard this patch.
phpicalendar/languages/portuguese.inc.php 1 patch
Spacing   +53 added lines, -53 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
 // 21-sep-2004 13:06 PM GMT
8 8
 // Submit new translations to [email protected]
9 9
 
10
-$lang['l_day']				= 'Dia';
10
+$lang['l_day'] = 'Dia';
11 11
 $lang['l_week']				= 'Semana';
12 12
 $lang['l_month']			= 'M&ecirc;s';
13 13
 $lang['l_year']				= 'Ano';
@@ -41,50 +41,50 @@  discard block
 block discarded – undo
41 41
 $lang['l_goweek']           = 'Ir para esta Semana';
42 42
 $lang['l_gomonth']          = 'Ir para este M&ecirc;s';
43 43
 $lang['l_goyear']           = 'Ir para este Ano';
44
-$lang['l_search']			= 'Buscar'; // the verb
45
-$lang['l_results']			= 'Buscar Resultados';
46
-$lang['l_pick_multiple'] 	= 'Sele&ccedil;&atilde;o M&uacute;ltipla';
44
+$lang['l_search'] = 'Buscar'; // the verb
45
+$lang['l_results'] = 'Buscar Resultados';
46
+$lang['l_pick_multiple'] = 'Sele&ccedil;&atilde;o M&uacute;ltipla';
47 47
 $lang['l_query']			= 'Quest&atilde;o: '; // will be followed by the search query
48
-$lang['l_no_results']		= 'Registos n&atilde;o encontrados';
48
+$lang['l_no_results'] = 'Registos n&atilde;o encontrados';
49 49
 $lang['l_goprint']			= 'Vers&atilde;o para imprimir';
50 50
 $lang['l_time']				= 'Hora';
51 51
 $lang['l_summary']			= 'Resumo';
52
-$lang['l_description']		= 'Descri&ccedil;&atilde;o';
52
+$lang['l_description'] = 'Descri&ccedil;&atilde;o';
53 53
 $lang['l_this_site_is']		= 'Esse site &eacute;';
54 54
 $lang['l_no_events_day']	= 'N&atilde;o h&aacute; eventos para hoje.';
55
-$lang['l_no_events_week']	= 'N&atilde;o h&aacute; eventos para esta semana.';
56
-$lang['l_no_events_month']	= 'N&atilde;o h&aacute; eventos para esse m&ecirc;s.';
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
55
+$lang['l_no_events_week'] = 'N&atilde;o h&aacute; eventos para esta semana.';
56
+$lang['l_no_events_month'] = 'N&atilde;o h&aacute; eventos para esse m&ecirc;s.';
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_rsslanguage']		= 'en-us';
61 61
 $lang['l_search_took']		= 'Busca realizada em %s segundos';
62
-$lang['l_recurring_event']	= 'Evento recorrente';
62
+$lang['l_recurring_event'] = 'Evento recorrente';
63 63
 $lang['l_exception']		= 'Exce&ccedil;&atilde;o';
64 64
 $lang['l_no_query']			= 'Nenhuma consulta fornecida';
65 65
 $lang['l_preferences']		= 'Op&ccedil;&otilde;es';
66
-$lang['l_printer']			= 'Impressora';
66
+$lang['l_printer'] = 'Impressora';
67 67
 $lang['l_select_lang']		= 'Selecione sua linguagem principal:';
68 68
 $lang['l_select_cal']		= 'Selecione seu calend&aacute;o padr&atilde;:';
69 69
 $lang['l_select_view']		= 'Selecione sua vis&atilde;o padr&atilde;:';
70 70
 $lang['l_select_time']		= 'Selecione sua hor&aacute;rio de in&iacute;cio padr&atilde;:';
71 71
 $lang['l_select_day']		= 'Selecione seu dia de inic&iacute;o da semana padr&atilde;:';
72
-$lang['l_select_style']		= 'Selecione seu estilo padr&atilde;:';
72
+$lang['l_select_style'] = 'Selecione seu estilo padr&atilde;:';
73 73
 $lang['l_set_prefs']		= 'Define prefer&ecirc;ncias';
74
-$lang['l_completed_date']	= 'Completed on';
74
+$lang['l_completed_date'] = 'Completed on';
75 75
 $lang['l_completed']		= 'Completed';
76
-$lang['l_created']			= 'Criado:';
77
-$lang['l_due']				= 'Due:';
76
+$lang['l_created'] = 'Criado:';
77
+$lang['l_due'] = 'Due:';
78 78
 $lang['l_priority']			= 'Prioridade:';
79 79
 $lang['l_priority_high']	= 'Alta';
80 80
 $lang['l_priority_low']		= 'Baixa';
81
-$lang['l_priority_medium']	= 'M&eacute;dia';
81
+$lang['l_priority_medium'] = 'M&eacute;dia';
82 82
 $lang['l_priority_none']	= 'Nenhuma';
83
-$lang['l_status']			= 'Status';
84
-$lang['l_status_confirmed'] = 'CONFIRMADO' ; 
83
+$lang['l_status'] = 'Status';
84
+$lang['l_status_confirmed'] = 'CONFIRMADO'; 
85 85
 $lang['l_status_cancelled'] = 'CANCELADO'; 
86 86
 $lang['l_status_tentative'] = 'TENTATIVA'; 
87
-$lang['l_todo']				= 'Todo items';
87
+$lang['l_todo'] = 'Todo items';
88 88
 $lang['l_unfinished']		= 'N&atilde;o finalizado';
89 89
 $lang['l_prefs_set'] 		= 'Suas prefer&ecirc;ncias foram definidas.';
90 90
 $lang['l_prefs_unset'] 		= 'Prefer&ecirc;ncias n&atilde;o definidas. As mudan&ccedil;as ser&atilde;o carregadas na pr&oacute;xima p&aacute;gina.';
@@ -92,39 +92,39 @@  discard block
 block discarded – undo
92 92
 $lang['l_organizer']		= 'Organizador';
93 93
 $lang['l_attendee']			= 'Confirma&ccedil;&atilde;o';
94 94
 $lang['l_location']			= 'Local';
95
-$lang['l_admin_header']		= 'Administra&ccedil;&atilde;o do PHP iCalendar';
95
+$lang['l_admin_header'] = 'Administra&ccedil;&atilde;o do PHP iCalendar';
96 96
 $lang['l_username']			= 'Usu&aacute;rio';
97 97
 $lang['l_password']			= 'Senha';
98
-$lang['l_login']			= 'Login';
98
+$lang['l_login'] = 'Login';
99 99
 $lang['l_invalid_login']	= 'Usu&aacute;rio ou senha incorretos.';
100 100
 $lang['l_addupdate_cal']	= 'Adiciona ou Atualiza um Calend&aacute;rio';
101
-$lang['l_addupdate_desc']	= 'Adiciona um calend&aacute;rio atrav&eacute;s do upload de um novo arquivo com o mesmo nome.';
102
-$lang['l_delete_cal']		= 'Remove um Calend&aacute;rio';
103
-$lang['l_logout']			= 'Logout';
101
+$lang['l_addupdate_desc'] = 'Adiciona um calend&aacute;rio atrav&eacute;s do upload de um novo arquivo com o mesmo nome.';
102
+$lang['l_delete_cal'] = 'Remove um Calend&aacute;rio';
103
+$lang['l_logout'] = 'Logout';
104 104
 $lang['l_cal_file']			= 'Arquivo do Calend&aacute;rio';
105 105
 $lang['l_php_error']		= 'Erro do PHP';
106
-$lang['l_upload_error_gen']	= 'Existe um problem com o upload.';
106
+$lang['l_upload_error_gen'] = 'Existe um problem com o upload.';
107 107
 $lang['l_upload_error'][0]	= 'Existe um problem com o upload.';
108 108
 $lang['l_upload_error'][1]	= 'O arquivo que voc&ecirc; est&aacute; tentando fazer o upload &eacute; muito grande.';
109 109
 $lang['l_upload_error'][2]	= 'O arquivo que voc&ecirc; est&aacute; tentando fazer o upload &eacute; muito grande.';
110 110
 $lang['l_upload_error'][3]	= 'O arquivo que voc&ecirc; est&aacute; tentando fazer o upload foi salvo incompleto.';
111 111
 $lang['l_upload_error'][4]	= 'Voc&ecirc; deve selecionar um arquivo para o upload.';
112 112
 $lang['l_upload_error_type'] = 'Somente arquivos .ics podem ser feitos upload.';
113
-$lang['l_copy_error']		= 'Falha ao copiar arquivo';
114
-$lang['l_delete_error']		= 'Falha ao apagar arquivo';
113
+$lang['l_copy_error'] = 'Falha ao copiar arquivo';
114
+$lang['l_delete_error'] = 'Falha ao apagar arquivo';
115 115
 $lang['l_delete_success']	= 'foi apagado com sucesso.';
116 116
 $lang['l_action_success']	= 'Sua a&ccedil;&atilde;o foi bem sucedida.';
117 117
 $lang['l_submit']			= 'Enviar';
118 118
 $lang['l_delete']			= 'Apagar';
119
-$all_cal_comb_lang			= 'Todos Juntos';
119
+$all_cal_comb_lang = 'Todos Juntos';
120 120
 
121 121
 // New for 2.0
122
-$lang['l_legend']			= 'Legenda';
122
+$lang['l_legend'] = 'Legenda';
123 123
 $lang['l_admin_subhead']	= 'Gerencie seus calend&aacute;rios a partir desta p&aacute;gina';
124 124
 $lang['l_prefs_subhead']	= 'Define um cookie para visitar este site';
125
-$lang['l_rss_info']			= 'Informa&ccedil;&atilde;o do RSS';
126
-$lang['l_rss_subhead']		= 'RSS feeds b&aacute;sicos dispon&iacute;veis para cada calend&aacute;rio';
127
-$lang['l_rss_notenabled']	= 'RSS n&atilde;o est&aacute; dispon&iacute;vel para este site';
125
+$lang['l_rss_info'] = 'Informa&ccedil;&atilde;o do RSS';
126
+$lang['l_rss_subhead'] = 'RSS feeds b&aacute;sicos dispon&iacute;veis para cada calend&aacute;rio';
127
+$lang['l_rss_notenabled'] = 'RSS n&atilde;o est&aacute; dispon&iacute;vel para este site';
128 128
 
129 129
 // - navigation
130 130
 $lang['l_back'] = 'Voltar';
@@ -138,31 +138,31 @@  discard block
 block discarded – undo
138 138
 // ---------------------------------
139 139
 
140 140
 // $format_recur, items enclosed in % will be substituted with variables
141
-$format_recur_lang['delimiter']	= ', ';								// ie, 'one, two, three'
141
+$format_recur_lang['delimiter'] = ', '; // ie, 'one, two, three'
142 142
 
143
-$format_recur_lang['yearly']		= array('ano','anos');		// for these, put singular
144
-$format_recur_lang['monthly']		= array('m&ecirc;s','meses');		// and plural forms
145
-$format_recur_lang['weekly']		= array('semana','semanas');		// these will be %freq%
146
-$format_recur_lang['daily']			= array('dia','dias');			// in the replacement below
147
-$format_recur_lang['hourly']		= array('hora','horas');
148
-$format_recur_lang['minutely']		= array('minuto','minutos');
149
-$format_recur_lang['secondly']		= array('segundo','segundos');
143
+$format_recur_lang['yearly']		= array('ano', 'anos'); // for these, put singular
144
+$format_recur_lang['monthly'] = array('m&ecirc;s', 'meses'); // and plural forms
145
+$format_recur_lang['weekly']		= array('semana', 'semanas'); // these will be %freq%
146
+$format_recur_lang['daily']			= array('dia', 'dias'); // in the replacement below
147
+$format_recur_lang['hourly']		= array('hora', 'horas');
148
+$format_recur_lang['minutely']		= array('minuto', 'minutos');
149
+$format_recur_lang['secondly']		= array('segundo', 'segundos');
150 150
 
151
-$format_recur_lang['start']			= 'A cada %int% %freq% %for%';	// ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5'
152
-$format_recur_lang['until']			= 'at&eacute; %date%';				// ie, 'until January 4'
153
-$format_recur_lang['count']			= 'durante %int% vezes';		// ie, 'for 5 times'
151
+$format_recur_lang['start']			= 'A cada %int% %freq% %for%'; // ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5'
152
+$format_recur_lang['until']			= 'at&eacute; %date%'; // ie, 'until January 4'
153
+$format_recur_lang['count']			= 'durante %int% vezes'; // ie, 'for 5 times'
154 154
 
155
-$format_recur_lang['bymonth']		= 'Nos meses: %list%';			// ie, 'In months: January, February, March'
156
-$format_recur_lang['bymonthday']	= 'Nas datas: %list%';			// ie, 'On dates: 1, 2, 3, 4'
157
-$format_recur_lang['byday']			= 'Nos dias: %list%';			// ie, 'On days: Mon, Tues, Wed, Thurs'
155
+$format_recur_lang['bymonth'] = 'Nos meses: %list%'; // ie, 'In months: January, February, March'
156
+$format_recur_lang['bymonthday'] = 'Nas datas: %list%'; // ie, 'On dates: 1, 2, 3, 4'
157
+$format_recur_lang['byday'] = 'Nos dias: %list%'; // ie, 'On days: Mon, Tues, Wed, Thurs'
158 158
 
159 159
 // ---------------------------------
160 160
 
161
-$daysofweek_lang                        = array ('Domingo','Segunda','Ter&ccedil;a','Quarta','Quinta','Sexta','S&aacute;bado');
162
-$daysofweekshort_lang                = array ('Dom','Seg','Ter','Qua','Qui','Sex','S&aacute;b');
163
-$daysofweekreallyshort_lang        = array ('D','S','T','Q','Q','S','S');
164
-$monthsofyear_lang                        = array ('Janeiro','Fevereiro','Mar&ccedil;o','Abril','Maio','Junho','Julho','Agosto','Setembro','Outubro','Novembro','Dezembro');
165
-$monthsofyearshort_lang                = array ('Jan','Fev','Mar','Abr','Mai','Jun','Jul','Ago','Set','Out','Nov','Dez');
161
+$daysofweek_lang = array('Domingo', 'Segunda', 'Ter&ccedil;a', 'Quarta', 'Quinta', 'Sexta', 'S&aacute;bado');
162
+$daysofweekshort_lang = array('Dom', 'Seg', 'Ter', 'Qua', 'Qui', 'Sex', 'S&aacute;b');
163
+$daysofweekreallyshort_lang = array('D', 'S', 'T', 'Q', 'Q', 'S', 'S');
164
+$monthsofyear_lang = array('Janeiro', 'Fevereiro', 'Mar&ccedil;o', 'Abril', 'Maio', 'Junho', 'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro');
165
+$monthsofyearshort_lang = array('Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul', 'Ago', 'Set', 'Out', 'Nov', 'Dez');
166 166
 
167 167
 // For time formatting, check out: http://www.php.net/manual/en/function.date.php
168 168
 $timeFormat = 'G:i';
Please login to merge, or discard this patch.