@@ -338,20 +338,17 @@ |
||
| 338 | 338 | if ($table == NULL && $v >= '8.1') |
| 339 | 339 | { |
| 340 | 340 | $sql = 'SELECT LASTVAL() as ins_id'; |
| 341 | - } |
|
| 342 | - elseif ($table != NULL && $column != NULL && $v >= '8.0') |
|
| 341 | + } elseif ($table != NULL && $column != NULL && $v >= '8.0') |
|
| 343 | 342 | { |
| 344 | 343 | $sql = sprintf("SELECT pg_get_serial_sequence('%s','%s') as seq", $table, $column); |
| 345 | 344 | $query = $this->query($sql); |
| 346 | 345 | $row = $query->row(); |
| 347 | 346 | $sql = sprintf("SELECT CURRVAL('%s') as ins_id", $row->seq); |
| 348 | - } |
|
| 349 | - elseif ($table != NULL) |
|
| 347 | + } elseif ($table != NULL) |
|
| 350 | 348 | { |
| 351 | 349 | // seq_name passed in table parameter |
| 352 | 350 | $sql = sprintf("SELECT CURRVAL('%s') as ins_id", $table); |
| 353 | - } |
|
| 354 | - else |
|
| 351 | + } else |
|
| 355 | 352 | { |
| 356 | 353 | return pg_last_oid($this->result_id); |
| 357 | 354 | } |
@@ -42,8 +42,7 @@ |
||
| 42 | 42 | if ($this->conn_id) |
| 43 | 43 | { |
| 44 | 44 | return "SELECT '".$this->database."'"; |
| 45 | - } |
|
| 46 | - else |
|
| 45 | + } else |
|
| 47 | 46 | { |
| 48 | 47 | return FALSE; |
| 49 | 48 | } |
@@ -318,31 +318,26 @@ |
||
| 318 | 318 | if ($index_page === TRUE) |
| 319 | 319 | { |
| 320 | 320 | $link .= 'href="'.$CI->config->site_url($v).'" '; |
| 321 | - } |
|
| 322 | - else |
|
| 321 | + } else |
|
| 323 | 322 | { |
| 324 | 323 | $link .= 'href="'.$CI->config->slash_item('base_url').$v.'" '; |
| 325 | 324 | } |
| 326 | - } |
|
| 327 | - else |
|
| 325 | + } else |
|
| 328 | 326 | { |
| 329 | 327 | $link .= "$k=\"$v\" "; |
| 330 | 328 | } |
| 331 | 329 | } |
| 332 | 330 | |
| 333 | 331 | $link .= "/>"; |
| 334 | - } |
|
| 335 | - else |
|
| 332 | + } else |
|
| 336 | 333 | { |
| 337 | 334 | if (strpos($href, '://') !== FALSE) |
| 338 | 335 | { |
| 339 | 336 | $link .= 'href="'.$href.'" '; |
| 340 | - } |
|
| 341 | - elseif ($index_page === TRUE) |
|
| 337 | + } elseif ($index_page === TRUE) |
|
| 342 | 338 | { |
| 343 | 339 | $link .= 'href="'.$CI->config->site_url($href).'" '; |
| 344 | - } |
|
| 345 | - else |
|
| 340 | + } else |
|
| 346 | 341 | { |
| 347 | 342 | $link .= 'href="'.$CI->config->slash_item('base_url').$href.'" '; |
| 348 | 343 | } |
@@ -232,8 +232,7 @@ |
||
| 232 | 232 | if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/smileys.php')) |
| 233 | 233 | { |
| 234 | 234 | include(APPPATH.'config/'.ENVIRONMENT.'/smileys.php'); |
| 235 | - } |
|
| 236 | - elseif (file_exists(APPPATH.'config/smileys.php')) |
|
| 235 | + } elseif (file_exists(APPPATH.'config/smileys.php')) |
|
| 237 | 236 | { |
| 238 | 237 | include(APPPATH.'config/smileys.php'); |
| 239 | 238 | } |
@@ -584,8 +584,7 @@ |
||
| 584 | 584 | if ($javascript == TRUE) |
| 585 | 585 | { |
| 586 | 586 | $att .= $key.'='.$val.','; |
| 587 | - } |
|
| 588 | - else |
|
| 587 | + } else |
|
| 589 | 588 | { |
| 590 | 589 | $att .= ' '.$key.'="'.$val.'"'; |
| 591 | 590 | } |
@@ -465,8 +465,7 @@ discard block |
||
| 465 | 465 | if (isset($ex['2']) && preg_match('/[0-9]{1,2}/', $ex['2'])) |
| 466 | 466 | { |
| 467 | 467 | $sec = (strlen($ex['2']) == 1) ? '0'.$ex['2'] : $ex['2']; |
| 468 | - } |
|
| 469 | - else |
|
| 468 | + } else |
|
| 470 | 469 | { |
| 471 | 470 | // Unless specified, seconds get set to zero. |
| 472 | 471 | $sec = '00'; |
@@ -476,14 +475,17 @@ discard block |
||
| 476 | 475 | { |
| 477 | 476 | $ampm = strtolower($split['2']); |
| 478 | 477 | |
| 479 | - if (substr($ampm, 0, 1) == 'p' AND $hour < 12) |
|
| 480 | - $hour = $hour + 12; |
|
| 478 | + if (substr($ampm, 0, 1) == 'p' AND $hour < 12) { |
|
| 479 | + $hour = $hour + 12; |
|
| 480 | + } |
|
| 481 | 481 | |
| 482 | - if (substr($ampm, 0, 1) == 'a' AND $hour == 12) |
|
| 483 | - $hour = '00'; |
|
| 482 | + if (substr($ampm, 0, 1) == 'a' AND $hour == 12) { |
|
| 483 | + $hour = '00'; |
|
| 484 | + } |
|
| 484 | 485 | |
| 485 | - if (strlen($hour) == 1) |
|
| 486 | - $hour = '0'.$hour; |
|
| 486 | + if (strlen($hour) == 1) { |
|
| 487 | + $hour = '0'.$hour; |
|
| 488 | + } |
|
| 487 | 489 | } |
| 488 | 490 | |
| 489 | 491 | return mktime($hour, $min, $sec, $month, $day, $year); |
@@ -207,8 +207,7 @@ |
||
| 207 | 207 | $y = rand(0, $img_height / 2); |
| 208 | 208 | imagestring($im, $font_size, $x, $y, substr($word, $i, 1), $text_color); |
| 209 | 209 | $x += ($font_size * 2); |
| 210 | - } |
|
| 211 | - else |
|
| 210 | + } else |
|
| 212 | 211 | { |
| 213 | 212 | $y = rand($img_height / 2, $img_height - 3); |
| 214 | 213 | imagettftext($im, $font_size, $angle, $x, $y, $text_color, $font_path, substr($word, $i, 1)); |
@@ -283,8 +283,7 @@ |
||
| 283 | 283 | //echo 'tttttttttttt'; |
| 284 | 284 | if (isset($GLOBALS['CI'])) { |
| 285 | 285 | $GLOBALS['CI']->load->view($GLOBALS['TI_CURRENT_BASE_TEMPLATE']); |
| 286 | - } |
|
| 287 | - else { |
|
| 286 | + } else { |
|
| 288 | 287 | include realpath( TI_VIEWS_DIR . $GLOBALS['TI_CURRENT_BASE_TEMPLATE']); |
| 289 | 288 | } |
| 290 | 289 | } |
@@ -83,10 +83,11 @@ discard block |
||
| 83 | 83 | if(!function_exists('form_breadcrumb')){
|
| 84 | 84 | function form_breadcrumb($info=''){
|
| 85 | 85 | $form=false; |
| 86 | - if(!empty($info)) |
|
| 87 | - $form.="<div class='breadcrumb'> |
|
| 86 | + if(!empty($info)) { |
|
| 87 | + $form.="<div class='breadcrumb'> |
|
| 88 | 88 | <a href='".$info['url']."'>".$info['name']."</a> |
| 89 | - </div>"; |
|
| 89 | + </div>"; |
|
| 90 | + } |
|
| 90 | 91 | return $form; |
| 91 | 92 | } |
| 92 | 93 | } |
@@ -212,7 +213,7 @@ discard block |
||
| 212 | 213 | </span> |
| 213 | 214 | </div> |
| 214 | 215 | </div>'; |
| 215 | - }else{
|
|
| 216 | + } else{
|
|
| 216 | 217 | return "<div class='col-md-5 no-padding'><image "._parse_form_attributes($data, $defaults).$extra." /></div>"; |
| 217 | 218 | } |
| 218 | 219 | |
@@ -375,22 +376,25 @@ discard block |
||
| 375 | 376 | } |
| 376 | 377 | } |
| 377 | 378 | |
| 378 | - if ($extra != '') $extra = ' '.$extra; |
|
| 379 | + if ($extra != '') { |
|
| 380 | + $extra = ' '.$extra; |
|
| 381 | + } |
|
| 379 | 382 | $multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : ''; |
| 380 | 383 | if(is_array($name)){
|
| 381 | 384 | $str=null; |
| 382 | 385 | foreach($name as $key=>$value){
|
| 383 | - if($key !='class' && $key!='disabled') |
|
| 384 | - $str.=$key."='$value' "; |
|
| 386 | + if($key !='class' && $key!='disabled') { |
|
| 387 | + $str.=$key."='$value' "; |
|
| 388 | + } |
|
| 385 | 389 | } |
| 386 | 390 | if(isset($name['disabled']) && $name['disabled']== 'disabled'){
|
| 387 | 391 | $str.='disabled = "disabled"'; |
| 388 | 392 | } |
| 389 | 393 | $form = '<select '.$str." class='col-md-5 form-control selectpicker ".$name['class'].$extra."' data-live-search='true'>\n"; |
| 390 | - }else{
|
|
| 394 | + } else{
|
|
| 391 | 395 | if(!empty($extra)){
|
| 392 | 396 | $form = '<select name="'.$name.'"' .$multiple." class='col-md-5 form-control selectpicker ".$extra."' data-live-search='true'>\n"; |
| 393 | - }else{
|
|
| 397 | + } else{
|
|
| 394 | 398 | $form = '<select name="'.$name.'"' .$multiple." class='col-md-5 form-control selectpicker' data-live-search='true'>\n"; |
| 395 | 399 | } |
| 396 | 400 | } |
@@ -448,15 +452,16 @@ discard block |
||
| 448 | 452 | $selected = array($_POST[$name]); |
| 449 | 453 | } |
| 450 | 454 | } |
| 451 | - if ($extra != '') $extra = ' '.$extra; |
|
| 455 | + if ($extra != '') { |
|
| 456 | + $extra = ' '.$extra; |
|
| 457 | + } |
|
| 452 | 458 | $class= isset($name['class']) && !empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" :"col-md-5 form-control selectpicker"; |
| 453 | 459 | $multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : ''; |
| 454 | 460 | if(is_array($name) && !isset($name["id"])){
|
| 455 | 461 | $form = '<select name="'.$name['name'].'"'." class='$class' data-live-search='true'>\n"; |
| 456 | - }else if(is_array($name) && isset($name["id"])){
|
|
| 462 | + } else if(is_array($name) && isset($name["id"])){
|
|
| 457 | 463 | $form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='$class' data-live-search='true'>\n"; |
| 458 | - } |
|
| 459 | - else{
|
|
| 464 | + } else{
|
|
| 460 | 465 | $form = '<select name="'.$name.'"' .$multiple." class='$class' data-live-search='true'>\n"; |
| 461 | 466 | } |
| 462 | 467 | |
@@ -517,7 +522,9 @@ discard block |
||
| 517 | 522 | /* |
| 518 | 523 | ASTPP 3.0 For Search Display In |
| 519 | 524 | */ |
| 520 | - if ($extra != '' && !is_array($extra)) $extra = ' '.$extra; |
|
| 525 | + if ($extra != '' && !is_array($extra)) { |
|
| 526 | + $extra = ' '.$extra; |
|
| 527 | + } |
|
| 521 | 528 | /**********************************************************/ |
| 522 | 529 | |
| 523 | 530 | $class= isset($name['class']) && !empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" :"col-md-5 form-control selectpicker"; |
@@ -530,15 +537,15 @@ discard block |
||
| 530 | 537 | /*********************************/ |
| 531 | 538 | if(is_array($name) && !isset($name["id"])){
|
| 532 | 539 | $form = '<select name="'.$name['name'].'"'." class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n"; |
| 533 | - }else if(is_array($name) && isset($name["id"])){
|
|
| 540 | + } else if(is_array($name) && isset($name["id"])){
|
|
| 534 | 541 | $form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n"; |
| 535 | - }else{
|
|
| 542 | + } else{
|
|
| 536 | 543 | $form = '<select name="'.$name.'"' .$multiple." class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n"; |
| 537 | 544 | } |
| 538 | 545 | /* |
| 539 | 546 | ASTPP 3.0 For Search Display In |
| 540 | 547 | */ |
| 541 | - }else{
|
|
| 548 | + } else{
|
|
| 542 | 549 | |
| 543 | 550 | $form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='".$extra['class']." $class' style='".$extra['style']."' data-live-search='true'>\n"; |
| 544 | 551 | } |
@@ -690,7 +697,7 @@ discard block |
||
| 690 | 697 | //echo "<pre>".$value; print_r($extra); exit; |
| 691 | 698 | if(isset($extra[$value]) && !empty($extra) && $extra[$value] == '0'){
|
| 692 | 699 | $class='onoffswitch-inner'; |
| 693 | - }else{
|
|
| 700 | + } else{
|
|
| 694 | 701 | $class='onoffswitch-inner'; |
| 695 | 702 | } |
| 696 | 703 | /* if(isset($extra) && $extra != ''){
|