Changeset 5845
- Timestamp:
- 06/29/08 15:33:10 (3 months ago)
- Files:
-
- modules/branches/2.3 (modified) (1 prop)
- modules/branches/2.3/daynight/functions.inc.php (modified) (1 diff)
- modules/branches/2.3/daynight/module.xml (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
modules/branches/2.3
- Property svnmerge-integrated changed from /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998,4007,4022-4023,4089,4092,4098,4265,4285 /modules/branches/2.4:1-5079,5090,5093,5097-5118,5120-5170,5172,5174,5176-5182,5184-5199,5202-5203,5205-5211,5239,5271-5272,5312,5383,5516,5544-5545,5548-5549,5555,5564,5570,5572-5574,5576-5578,5596,5606-5610,5612,5615-5618,5623-5624,5628,5630-5642,5644-5646,5648-5651,5653-5654,5656-5657,5660,5687-5699,5701-5702,5704-5715,5723-5727,5729-5730,5733-5741,5752-5753,5756,5830-5831 to /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998,4007,4022-4023,4089,4092,4098,4265,4285 /modules/branches/2.4:1-5079,5090,5093,5097-5118,5120-5170,5172,5174,5176-5182,5184-5199,5202-5203,5205-5211,5239,5271-5272,5312,5383,5516,5544-5545,5548-5549,5555,5564,5570,5572-5574,5576-5578,5596,5606-5610,5612,5615-5618,5623-5624,5628,5630-5642,5644-5646,5648-5651,5653-5654,5656-5657,5660,5687-5699,5701-5702,5704-5715,5723-5727,5729-5730,5733-5741,5752-5753,5756,5830-5831,5842-5843
modules/branches/2.3/daynight/functions.inc.php
r5105 r5845 236 236 sql("INSERT INTO daynight (ext, dmode, dest) VALUES ('$id', 'password', '$password')"); 237 237 } 238 if (isset($post['fc_description']) && trim($post['fc_description'] != "")) { 239 $fc_description = trim($post['fc_description']); 240 sql("INSERT INTO daynight (ext, dmode, dest) VALUES ('$id', 'fc_description', '$fc_description')"); 241 } 238 $fc_description = isset($post['fc_description']) ? trim($post['fc_description']) : ""; 239 sql("INSERT INTO daynight (ext, dmode, dest) VALUES ('$id', 'fc_description', '$fc_description')"); 242 240 243 241 $dn = new dayNightObject($id); modules/branches/2.3/daynight/module.xml
r5106 r5845 2 2 <rawname>daynight</rawname> 3 3 <name>Day Night Mode</name> 4 <version>1.0.2. 4</version>4 <version>1.0.2.5</version> 5 5 <type>setup</type> 6 6 <category>Inbound Call Control</category> … … 10 10 </description> 11 11 <changelog> 12 *1.0.2.5* #2734 fixed issue creating index with no description made it disapear 12 13 *1.0.2.4* #2414 fix other unmatched ) syntax error 13 14 *1.0.2.3* #2414 fix unmatched ) syntax error
