Changeset 5605
- Timestamp:
- 01/18/08 14:48:07 (4 years ago)
- Files:
-
- modules/branches/2.4/core/functions.inc.php (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
modules/branches/2.4/core/functions.inc.php
r5575 r5605 148 148 if (version_compare($ast_version, "1.4", "ge")) { 149 149 $call_limit = "call-limit=50\n"; 150 $ver12 = false; 150 151 } else { 151 152 $call_limit = ""; 153 $ver12 = true; 152 154 } 153 155 … … 158 160 } 159 161 foreach ($results as $result) { 160 $additional .= $result['keyword']."=".$result['data']."\n"; 162 if ($ver12) { 163 $additional .= $result['keyword']."=".$result['data']."\n"; 164 } else { 165 $option = $result['data']; 166 switch ($result['keyword']) { 167 case 'allow': 168 case 'disallow': 169 if ($option != '') 170 $additional .= $result['keyword']."=$option\n"; 171 break; 172 default: 173 $additional .= $result['keyword']."=$option\n"; 174 } 175 } 161 176 } 162 177 … … 179 194 foreach ($results2 as $result2) { 180 195 $options = explode("&", $result2['data']); 181 foreach ($options as $option) { 182 $output .= $result2['keyword']."=$option\n"; 196 if ($ver12) { 197 foreach ($options as $option) { 198 $output .= $result2['keyword']."=$option\n"; 199 } 200 } else { 201 foreach ($options as $option) { 202 switch ($result2['keyword']) { 203 case 'allow': 204 case 'disallow': 205 if ($option != '') 206 $output .= $result2['keyword']."=$option\n"; 207 break; 208 default: 209 $output .= $result2['keyword']."=$option\n"; 210 } 211 } 183 212 } 184 213 } … … 243 272 } 244 273 break; 274 case 'allow': 275 case 'disallow': 276 if ($option != '') 277 $additional .= $result['keyword']."=$option\n"; 278 break; 245 279 default: 246 280 $additional .= $result['keyword']."=$option\n"; … … 254 288 die($results->getMessage()); 255 289 } 256 290 257 291 foreach ($results as $result) { 258 292 $account = $result['data']; … … 264 298 if(DB::IsError($results2)) { 265 299 die($results2->getMessage()); 266 } 300 } 267 301 foreach ($results2 as $result2) { 268 302 $options = explode("&", $result2['data']); … … 284 318 $output .= $result2['keyword']."=$option\n"; 285 319 } 320 break; 321 case 'allow': 322 case 'disallow': 323 if ($option != '') 324 $output .= $result2['keyword']."=$option\n"; 286 325 break; 287 326 default:
