@@ -19,13 +19,13 @@ discard block |
||
| 19 | 19 | <div class="alert alert-info" style="display: none" id="ccm-page-type-composer-form-save-status"></div> |
| 20 | 20 | |
| 21 | 21 | <style>.form-group.ccm-composer-url-slug {display:none}</style> |
| 22 | -<?php $u = new User(); if($u->inGroup(Group::getByName('Administrators'))){ ?> |
|
| 22 | +<?php $u = new User(); if ($u->inGroup(Group::getByName('Administrators'))) { ?> |
|
| 23 | 23 | <style>.form-group.ccm-composer-url-slug {display:block !important}</style> |
| 24 | 24 | <?php } ?> |
| 25 | 25 | |
| 26 | 26 | <input type="hidden" name="ptID" value="<?php echo $pagetype->getPageTypeID()?>" /> |
| 27 | 27 | |
| 28 | -<?php foreach($fieldsets as $cfl) { ?> |
|
| 28 | +<?php foreach ($fieldsets as $cfl) { ?> |
|
| 29 | 29 | <fieldset> |
| 30 | 30 | <?php if ($cfl->getPageTypeComposerFormLayoutSetDisplayName()) { ?> |
| 31 | 31 | <legend><?php echo $cfl->getPageTypeComposerFormLayoutSetDisplayName()?></legend> |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | <?php } ?> |
| 36 | 36 | <?php $controls = PageTypeComposerFormLayoutSetControl::getList($cfl); |
| 37 | 37 | |
| 38 | - foreach($controls as $con) { |
|
| 38 | + foreach ($controls as $con) { |
|
| 39 | 39 | if (is_object($page)) { // we are loading content in |
| 40 | 40 | $con->setPageObject($page); |
| 41 | 41 | } |
@@ -6,7 +6,7 @@ |
||
| 6 | 6 | <div class="col-lg-12"> |
| 7 | 7 | <h1 class="page-header"><?php $page = Page::getCurrentPage(); echo $page->getCollectionName(); ?></h1> |
| 8 | 8 | <br> |
| 9 | - <?php $a= new Area('Page Content'); $a->display($c); ?> |
|
| 9 | + <?php $a = new Area('Page Content'); $a->display($c); ?> |
|
| 10 | 10 | </div> <!-- END col-lg-12 --> |
| 11 | 11 | </div> <!-- END row --> |
| 12 | 12 | </div> <!-- END container-fluid --> |
@@ -1,4 +1,4 @@ discard block |
||
| 1 | -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); |
|
| 1 | +<?php if (!defined('BASEPATH')) exit('No direct script access allowed'); |
|
| 2 | 2 | |
| 3 | 3 | /** |
| 4 | 4 | * Breadcrumb helper |
@@ -59,9 +59,9 @@ discard block |
||
| 59 | 59 | { |
| 60 | 60 | function array_replace(array &$array, array &$array1) |
| 61 | 61 | { |
| 62 | - foreach($array as $k=>$v) |
|
| 62 | + foreach ($array as $k=>$v) |
|
| 63 | 63 | { |
| 64 | - if(array_key_exists($k, $array1)) |
|
| 64 | + if (array_key_exists($k, $array1)) |
|
| 65 | 65 | { |
| 66 | 66 | $array[$k] = $array1[$k]; |
| 67 | 67 | } |
@@ -70,11 +70,11 @@ discard block |
||
| 70 | 70 | } |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | -if ( ! function_exists('set_breadcrumb')) |
|
| 73 | +if (!function_exists('set_breadcrumb')) |
|
| 74 | 74 | { |
| 75 | - function set_breadcrumb($delimiter_config = '', $exclude = '', $config= array()) |
|
| 75 | + function set_breadcrumb($delimiter_config = '', $exclude = '', $config = array()) |
|
| 76 | 76 | { |
| 77 | - $CI =& get_instance(); |
|
| 77 | + $CI = & get_instance(); |
|
| 78 | 78 | $CI->load->helper('url'); |
| 79 | 79 | $CI->lang->load('breadcrumb'); |
| 80 | 80 | $CI->config->load('breadcrumb'); |
@@ -87,43 +87,43 @@ discard block |
||
| 87 | 87 | * for guidance. |
| 88 | 88 | * @author Chris Miller |
| 89 | 89 | */ |
| 90 | - $attr_home = ( isset( $config['attr_home'] ) |
|
| 90 | + $attr_home = (isset($config['attr_home']) |
|
| 91 | 91 | ? $config['attr_home'] |
| 92 | - : $CI->config->item('attr_home') ); |
|
| 92 | + : $CI->config->item('attr_home')); |
|
| 93 | 93 | |
| 94 | - $unlink_home = ( isset( $config['unlike_home'] ) |
|
| 94 | + $unlink_home = (isset($config['unlike_home']) |
|
| 95 | 95 | ? $config['unlike_home'] |
| 96 | - : $CI->config->item('unlike_home') ); |
|
| 96 | + : $CI->config->item('unlike_home')); |
|
| 97 | 97 | |
| 98 | 98 | if (empty($exclude)) |
| 99 | 99 | { |
| 100 | 100 | $exclude = $CI->config->item('exclude'); |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | - $exclude_segment = ( isset( $config['exclude_segment'] ) |
|
| 104 | - ? array_merge($CI->config->item('exclude_segment'),$config['exclude_segment']) |
|
| 105 | - : $CI->config->item('exclude_segment') ); |
|
| 103 | + $exclude_segment = (isset($config['exclude_segment']) |
|
| 104 | + ? array_merge($CI->config->item('exclude_segment'), $config['exclude_segment']) |
|
| 105 | + : $CI->config->item('exclude_segment')); |
|
| 106 | 106 | |
| 107 | - $replacer_default = ( isset( $config['replacer'] ) |
|
| 108 | - ? array_merge($CI->config->item('replacer'),$config['replacer']) |
|
| 109 | - : $CI->config->item('replacer') ); |
|
| 107 | + $replacer_default = (isset($config['replacer']) |
|
| 108 | + ? array_merge($CI->config->item('replacer'), $config['replacer']) |
|
| 109 | + : $CI->config->item('replacer')); |
|
| 110 | 110 | |
| 111 | - $replacer_embed = ( isset( $config['replacer_embed'] ) |
|
| 112 | - ? array_merge($CI->config->item('replacer_embed'),$config['replacer_embed']) |
|
| 113 | - : $CI->config->item('replacer_embed') ); |
|
| 111 | + $replacer_embed = (isset($config['replacer_embed']) |
|
| 112 | + ? array_merge($CI->config->item('replacer_embed'), $config['replacer_embed']) |
|
| 113 | + : $CI->config->item('replacer_embed')); |
|
| 114 | 114 | |
| 115 | - $partial_replace = ( isset( $config['partial_replace'] ) |
|
| 116 | - ? array_merge($CI->config->item('partial_replace'),$config['partial_replace']) |
|
| 117 | - : $CI->config->item('partial_replace') ); |
|
| 115 | + $partial_replace = (isset($config['partial_replace']) |
|
| 116 | + ? array_merge($CI->config->item('partial_replace'), $config['partial_replace']) |
|
| 117 | + : $CI->config->item('partial_replace')); |
|
| 118 | 118 | |
| 119 | 119 | /* --- End Patch --- */ |
| 120 | 120 | |
| 121 | - $uri = rtrim($CI->uri->uri_string(),'/'); |
|
| 121 | + $uri = rtrim($CI->uri->uri_string(), '/'); |
|
| 122 | 122 | $uri_array_original = explode("/", $uri); |
| 123 | 123 | |
| 124 | 124 | // cahva's fix (http://codeigniter.com/forums/viewreply/855097/) |
| 125 | 125 | $uri_array_cnt = count($uri_array_original); |
| 126 | - if (config_item('hide_number_on_last_segment') && isset($uri_array_original[$uri_array_cnt-1]) && is_numeric($uri_array_original[$uri_array_cnt-1])) |
|
| 126 | + if (config_item('hide_number_on_last_segment') && isset($uri_array_original[$uri_array_cnt - 1]) && is_numeric($uri_array_original[$uri_array_cnt - 1])) |
|
| 127 | 127 | { |
| 128 | 128 | array_pop($uri_array_original); |
| 129 | 129 | } |
@@ -132,22 +132,22 @@ discard block |
||
| 132 | 132 | // If last segment is a number ? |
| 133 | 133 | $show_last_number = -1; |
| 134 | 134 | $number_array = count($uri_array_original); |
| 135 | - if (! $CI->config->item('hide_number_on_last_segment')) |
|
| 135 | + if (!$CI->config->item('hide_number_on_last_segment')) |
|
| 136 | 136 | { |
| 137 | 137 | $l_array = $number_array - 1; // last array number |
| 138 | - if (preg_match("/^[0-9]/", $uri_array_original[$l_array]) AND ! preg_match("/[a-zA-Z]+/", $uri_array_original[$l_array])) |
|
| 138 | + if (preg_match("/^[0-9]/", $uri_array_original[$l_array]) AND !preg_match("/[a-zA-Z]+/", $uri_array_original[$l_array])) |
|
| 139 | 139 | { |
| 140 | 140 | $show_last_number = $l_array; |
| 141 | 141 | } |
| 142 | 142 | } |
| 143 | 143 | |
| 144 | 144 | // Find segments uri that only contain a number |
| 145 | - foreach($uri_array_original as $key => $value) |
|
| 145 | + foreach ($uri_array_original as $key => $value) |
|
| 146 | 146 | { |
| 147 | 147 | // find number but keep number where positioned in the last segment |
| 148 | - if (preg_match("/^[0-9]/", $value) AND ! preg_match("/[a-zA-Z]+/", $value) AND $key != $show_last_number) |
|
| 148 | + if (preg_match("/^[0-9]/", $value) AND !preg_match("/[a-zA-Z]+/", $value) AND $key != $show_last_number) |
|
| 149 | 149 | { |
| 150 | - $uri_array_original[$key] = (int)$value; |
|
| 150 | + $uri_array_original[$key] = (int) $value; |
|
| 151 | 151 | |
| 152 | 152 | // If hide_number is TRUE then set the $exclude_segment array variable; |
| 153 | 153 | if ($CI->config->item('hide_number')) |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | $key_uri = array_search($key, $uri_array_original, TRUE); |
| 191 | 191 | |
| 192 | 192 | // Add multilanguage |
| 193 | - if (! is_array($value) && $CI->config->item('multilang')) |
|
| 193 | + if (!is_array($value) && $CI->config->item('multilang')) |
|
| 194 | 194 | { |
| 195 | 195 | if ($CI->lang->line($value)) { |
| 196 | 196 | $value = ucwords($CI->lang->line($value)); |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | // Set wrapper |
| 207 | 207 | $wrapper = explode("|", $CI->config->item('wrapper')); |
| 208 | 208 | $wrapper_inline = explode("|", $CI->config->item('wrapper_inline')); |
| 209 | - if ( ! $CI->config->item('use_wrapper')) |
|
| 209 | + if (!$CI->config->item('use_wrapper')) |
|
| 210 | 210 | { |
| 211 | 211 | $wrapper = array('', ''); |
| 212 | 212 | $wrapper_inline = array('', ''); |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | $segment .= $uri_array_original[$i].'/'; |
| 242 | 242 | |
| 243 | 243 | // If replace value is an array |
| 244 | - if (! in_array($i, $skip_key, TRUE) && is_array($value)) // Skip link if replace value is null |
|
| 244 | + if (!in_array($i, $skip_key, TRUE) && is_array($value)) // Skip link if replace value is null |
|
| 245 | 245 | { |
| 246 | 246 | $number_added_value_array = count($value); |
| 247 | 247 | |
@@ -268,13 +268,13 @@ discard block |
||
| 268 | 268 | } |
| 269 | 269 | |
| 270 | 270 | // Look up for partial replace |
| 271 | - if (! empty($partial_replace)) |
|
| 271 | + if (!empty($partial_replace)) |
|
| 272 | 272 | { |
| 273 | 273 | foreach ($partial_replace as $pkey => $pvalue) |
| 274 | 274 | { |
| 275 | 275 | if ($CI->config->item('multilang')) |
| 276 | 276 | { |
| 277 | - $lang_pvalue = $CI->lang->line($pvalue)?$CI->lang->line($pvalue):$CI->lang->line($pkey); |
|
| 277 | + $lang_pvalue = $CI->lang->line($pvalue) ? $CI->lang->line($pvalue) : $CI->lang->line($pkey); |
|
| 278 | 278 | $preplace = ' '.$lang_pvalue.'_'; |
| 279 | 279 | |
| 280 | 280 | } else { |
@@ -306,7 +306,7 @@ discard block |
||
| 306 | 306 | $str_name[] = ucwords($val_name); |
| 307 | 307 | } |
| 308 | 308 | } |
| 309 | - else if (! in_array($i, $skip_key, TRUE)) // If value is NOT an array |
|
| 309 | + else if (!in_array($i, $skip_key, TRUE)) // If value is NOT an array |
|
| 310 | 310 | { |
| 311 | 311 | // Add multilanguage |
| 312 | 312 | if ($CI->config->item('multilang')) |
@@ -317,13 +317,13 @@ discard block |
||
| 317 | 317 | } |
| 318 | 318 | |
| 319 | 319 | // Look up for partial replace |
| 320 | - if (! empty($partial_replace)) |
|
| 320 | + if (!empty($partial_replace)) |
|
| 321 | 321 | { |
| 322 | 322 | foreach ($partial_replace as $pkey => $pvalue) |
| 323 | 323 | { |
| 324 | 324 | if ($CI->config->item('multilang')) |
| 325 | 325 | { |
| 326 | - $lang_pvalue = $CI->lang->line($pvalue)?$CI->lang->line($pvalue):$CI->lang->line($pkey); |
|
| 326 | + $lang_pvalue = $CI->lang->line($pvalue) ? $CI->lang->line($pvalue) : $CI->lang->line($pkey); |
|
| 327 | 327 | $preplace = ' '.$lang_pvalue.'_'; |
| 328 | 328 | |
| 329 | 329 | } else { |
@@ -343,7 +343,7 @@ discard block |
||
| 343 | 343 | $value = ucwords(strtolower(str_replace($char_to_replace, " ", $value))); |
| 344 | 344 | if ($CI->config->item('strip_regexp')) |
| 345 | 345 | { |
| 346 | - foreach($CI->config->item('strip_regexp') as $exp) |
|
| 346 | + foreach ($CI->config->item('strip_regexp') as $exp) |
|
| 347 | 347 | { |
| 348 | 348 | $value = preg_replace($exp, '', $value); |
| 349 | 349 | } |
@@ -359,13 +359,13 @@ discard block |
||
| 359 | 359 | |
| 360 | 360 | /* --- Chris Miller's Patch --- */ |
| 361 | 361 | // Check for custom additions |
| 362 | - if ( isset( $config['include_segments'] ) ) { |
|
| 362 | + if (isset($config['include_segments'])) { |
|
| 363 | 363 | |
| 364 | 364 | // Set our variable for usage |
| 365 | 365 | $include_segments = $config['include_segments']; |
| 366 | 366 | |
| 367 | 367 | // Loop our config array |
| 368 | - foreach ( $include_segments AS $k => $v ) { |
|
| 368 | + foreach ($include_segments AS $k => $v) { |
|
| 369 | 369 | $str_link[] = $k; |
| 370 | 370 | $str_name[] = ucwords($v); |
| 371 | 371 | } |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | |
| 385 | 385 | foreach ($str_name as $key => $val) { |
| 386 | 386 | // If home is hidden then don't show first delimiter |
| 387 | - if ( $i == 0 && ($str == '' || $str == $wrapper[0]) ) { |
|
| 387 | + if ($i == 0 && ($str == '' || $str == $wrapper[0])) { |
|
| 388 | 388 | $delimiter = ''; |
| 389 | 389 | } elseif (empty($delimiter_config)) { |
| 390 | 390 | $delimiter = $CI->config->item('delimiter'); |
@@ -393,7 +393,7 @@ discard block |
||
| 393 | 393 | } |
| 394 | 394 | |
| 395 | 395 | if ($val != '') { |
| 396 | - if ($key == $breadcrumb_number-1 && $CI->config->item('unlink_last_segment')) |
|
| 396 | + if ($key == $breadcrumb_number - 1 && $CI->config->item('unlink_last_segment')) |
|
| 397 | 397 | { |
| 398 | 398 | $str .= $delimiter.$wrapper_inline[0].ucwords($val).$wrapper_inline[1]; |
| 399 | 399 | } else { |
@@ -412,7 +412,7 @@ discard block |
||
| 412 | 412 | } |
| 413 | 413 | } |
| 414 | 414 | |
| 415 | -if ( ! function_exists('clear_breadcrumb')) |
|
| 415 | +if (!function_exists('clear_breadcrumb')) |
|
| 416 | 416 | { |
| 417 | 417 | function clear_breadcrumb() |
| 418 | 418 | { |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | |
| 19 | 19 | public function intranet() { |
| 20 | 20 | |
| 21 | - $this->db = $this->load->database('intranet',true); |
|
| 21 | + $this->db = $this->load->database('intranet', true); |
|
| 22 | 22 | |
| 23 | 23 | $crud = new grocery_CRUD(); |
| 24 | 24 | $crud->set_table('Logs'); |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | $crud->unset_edit(); |
| 30 | 30 | $output = $crud->render(); |
| 31 | 31 | |
| 32 | - $this->db = $this->load->database('default',true); |
|
| 32 | + $this->db = $this->load->database('default', true); |
|
| 33 | 33 | |
| 34 | 34 | $this->load->view('templates/header.php'); |
| 35 | 35 | $this->load->view('admin/jobs-logs/intranet', $output); |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | $crud->set_table('users_log'); |
| 45 | 45 | $crud->set_subject('Dashboard Logs', 'Dashboard Logs'); |
| 46 | 46 | $crud->unset_columns('id'); |
| 47 | - $crud->display_as('ip','IP')->display_as('url','URL'); |
|
| 47 | + $crud->display_as('ip', 'IP')->display_as('url', 'URL'); |
|
| 48 | 48 | $crud->unset_edit(); |
| 49 | 49 | $crud->unset_delete(); |
| 50 | 50 | $crud->unset_add(); |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | $crud->set_table('passkey_log'); |
| 64 | 64 | $crud->set_subject('Passkey', 'Passkey'); |
| 65 | 65 | $crud->unset_columns('id'); |
| 66 | - $crud->display_as('ip','IP')->display_as('passid','PassID'); |
|
| 66 | + $crud->display_as('ip', 'IP')->display_as('passid', 'PassID'); |
|
| 67 | 67 | $crud->unset_edit(); |
| 68 | 68 | $crud->unset_delete(); |
| 69 | 69 | $crud->unset_add(); |
@@ -18,13 +18,13 @@ discard block |
||
| 18 | 18 | |
| 19 | 19 | public function intranet() { |
| 20 | 20 | |
| 21 | - $this->db = $this->load->database('intranet',true); |
|
| 21 | + $this->db = $this->load->database('intranet', true); |
|
| 22 | 22 | |
| 23 | 23 | $crud = new grocery_CRUD(); |
| 24 | 24 | $crud->set_table('Users'); |
| 25 | 25 | $crud->set_subject('User', 'Users'); |
| 26 | - $crud->columns('uID','uName', 'uEmail', 'uDateAdded','uLastLogin','uNumLogins'); |
|
| 27 | - $crud->display_as('uID','Intranet UID')->display_as('uName', 'Username')->display_as('uEmail', 'Email Address') |
|
| 26 | + $crud->columns('uID', 'uName', 'uEmail', 'uDateAdded', 'uLastLogin', 'uNumLogins'); |
|
| 27 | + $crud->display_as('uID', 'Intranet UID')->display_as('uName', 'Username')->display_as('uEmail', 'Email Address') |
|
| 28 | 28 | ->display_as('uDateAdded', 'First Login')->display_as('uLastLogin', 'Last Login')->display_as('uNumLogins', 'Logins'); |
| 29 | 29 | $crud->unset_delete(); |
| 30 | 30 | $crud->unset_read(); |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | $crud->unset_edit(); |
| 33 | 33 | $output = $crud->render(); |
| 34 | 34 | |
| 35 | - $this->db = $this->load->database('default',true); |
|
| 35 | + $this->db = $this->load->database('default', true); |
|
| 36 | 36 | |
| 37 | 37 | $this->load->view('templates/header.php'); |
| 38 | 38 | $this->load->view('admin/user/view.php', $output); |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | $crud = new grocery_CRUD(); |
| 47 | 47 | $crud->set_table('users'); |
| 48 | 48 | $crud->set_subject('users', 'Dashboard Users'); |
| 49 | - $crud->display_as('uid','Intranet UID')->display_as('ip_last', 'Last IP')->display_as('ip_internal', 'Last internal IP')->display_as('ip_external', 'Last external IP') |
|
| 49 | + $crud->display_as('uid', 'Intranet UID')->display_as('ip_last', 'Last IP')->display_as('ip_internal', 'Last internal IP')->display_as('ip_external', 'Last external IP') |
|
| 50 | 50 | ->display_as('os', 'OS')->display_as('last_external', 'Last active external'); |
| 51 | 51 | $crud->unset_read(); |
| 52 | 52 | $crud->unset_edit(); |
@@ -66,15 +66,15 @@ discard block |
||
| 66 | 66 | $crud = new grocery_CRUD(); |
| 67 | 67 | $crud->set_table('passkey'); |
| 68 | 68 | $crud->set_subject('passkey', 'Passkey'); |
| 69 | - $crud->display_as('passid','PassID')->display_as('passkey', 'Passkey')->display_as('url', 'URL'); |
|
| 69 | + $crud->display_as('passid', 'PassID')->display_as('passkey', 'Passkey')->display_as('url', 'URL'); |
|
| 70 | 70 | $crud->unset_columns('id'); |
| 71 | 71 | $crud->unset_edit_fields('id'); |
| 72 | 72 | $crud->unset_read(); |
| 73 | 73 | $crud->unset_print(); |
| 74 | 74 | $crud->unset_export(); |
| 75 | - $crud->callback_before_insert(array($this,'encrypt_password_callback')); |
|
| 76 | - $crud->callback_before_update(array($this,'encrypt_password_callback')); |
|
| 77 | - $crud->callback_edit_field('passkey',array($this,'decrypt_password_callback')); |
|
| 75 | + $crud->callback_before_insert(array($this, 'encrypt_password_callback')); |
|
| 76 | + $crud->callback_before_update(array($this, 'encrypt_password_callback')); |
|
| 77 | + $crud->callback_edit_field('passkey', array($this, 'decrypt_password_callback')); |
|
| 78 | 78 | $output = $crud->render(); |
| 79 | 79 | |
| 80 | 80 | $this->load->view('templates/header.php'); |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | $last_name = $this->input->post('last_name'); |
| 38 | 38 | $email = $this->input->post('email'); |
| 39 | 39 | $postcode = $this->input->post('postcode'); |
| 40 | - $dob = $this->input->post('dob_d') . '/' . $this->input->post('dob_m') . '/' . $this->input->post('dob_y'); |
|
| 40 | + $dob = $this->input->post('dob_d').'/'.$this->input->post('dob_m').'/'.$this->input->post('dob_y'); |
|
| 41 | 41 | $current = $this->input->post('current'); |
| 42 | 42 | $current_other = $this->input->post('current_other'); |
| 43 | 43 | $subject = $this->input->post('subject'); |
@@ -73,8 +73,8 @@ |
||
| 73 | 73 | $crud->set_table('equipment_loan'); |
| 74 | 74 | $crud->set_subject('Equipment Loan', 'Equipment Loan'); |
| 75 | 75 | $crud->unset_columns('id'); |
| 76 | - $crud->display_as('ern','ER no.') |
|
| 77 | - ->display_as('sn','Serial Number'); |
|
| 76 | + $crud->display_as('ern', 'ER no.') |
|
| 77 | + ->display_as('sn', 'Serial Number'); |
|
| 78 | 78 | $crud->unset_edit_fields('logged', 'date'); |
| 79 | 79 | $crud->unset_add(); |
| 80 | 80 | $crud->unset_read(); |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | . 'Check the progress of other requests and the history of your transfers.'); |
| 134 | 134 | $this->email->send(); |
| 135 | 135 | |
| 136 | - $function = 'ownership_APPROVE_' . $id; |
|
| 136 | + $function = 'ownership_APPROVE_'.$id; |
|
| 137 | 137 | $this->user_model->function_log($function); |
| 138 | 138 | |
| 139 | 139 | redirect($_SERVER['HTTP_REFERER']); |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | . 'https://intranet.cant-col.ac.uk/dashboard/computing-support/ownership/check'); |
| 168 | 168 | $this->email->send(); |
| 169 | 169 | |
| 170 | - $function = 'ownership_REJECT_' . $id; |
|
| 170 | + $function = 'ownership_REJECT_'.$id; |
|
| 171 | 171 | $this->user_model->function_log($function); |
| 172 | 172 | |
| 173 | 173 | redirect($_SERVER['HTTP_REFERER']); |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | $id = $_GET['id']; |
| 191 | 191 | $this->ownership_model->cancel($id); |
| 192 | 192 | |
| 193 | - $function = 'ownership_CANCEL_' . $id; |
|
| 193 | + $function = 'ownership_CANCEL_'.$id; |
|
| 194 | 194 | $this->user_model->function_log($function); |
| 195 | 195 | |
| 196 | 196 | redirect($_SERVER['HTTP_REFERER']); |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | . 'https://intranet.cant-col.ac.uk/dashboard/computing-support/ownership/review'); |
| 224 | 224 | $this->email->send(); |
| 225 | 225 | |
| 226 | - $function = 'ownership_TERMS_' . $id; |
|
| 226 | + $function = 'ownership_TERMS_'.$id; |
|
| 227 | 227 | $this->user_model->function_log($function); |
| 228 | 228 | |
| 229 | 229 | redirect($_SERVER['HTTP_REFERER']); |
@@ -64,11 +64,11 @@ discard block |
||
| 64 | 64 | $this->email->bcc('[email protected]'); |
| 65 | 65 | $this->email->subject('New Staff Account'); |
| 66 | 66 | $this->email->message('A new staff account has been requested by '.$_SESSION['username'].' |
| 67 | - Name: ' . $this->input->post('first_name') . ' ' . $this->input->post('last_name') . ' |
|
| 68 | - Position: ' . $this->input->post('position') . ' |
|
| 69 | - Department: ' . $this->input->post('department') . ' |
|
| 67 | + Name: ' . $this->input->post('first_name').' '.$this->input->post('last_name').' |
|
| 68 | + Position: ' . $this->input->post('position').' |
|
| 69 | + Department: ' . $this->input->post('department').' |
|
| 70 | 70 | |
| 71 | - By: ' . $_SESSION['ldap']['full_name'] . ' |
|
| 71 | + By: ' . $_SESSION['ldap']['full_name'].' |
|
| 72 | 72 | |
| 73 | 73 | |
| 74 | 74 | The script will automaticly download user details and mark as created. |
@@ -79,8 +79,8 @@ discard block |
||
| 79 | 79 | $this->email->to($_SESSION['ldap']['email']); |
| 80 | 80 | $this->email->subject('New Staff Account'); |
| 81 | 81 | $this->email->message('You have submitted a new staff account request for |
| 82 | - Name: ' . $this->input->post('first_name') . ' ' . $this->input->post('last_name') . ' |
|
| 83 | - Position: ' . $this->input->post('position') . ' |
|
| 82 | + Name: ' . $this->input->post('first_name').' '.$this->input->post('last_name').' |
|
| 83 | + Position: ' . $this->input->post('position').' |
|
| 84 | 84 | |
| 85 | 85 | There password is: '.$password.' |
| 86 | 86 | Check their username here: https://intranet.cant-col.ac.uk/dashboard/computing-support/new-account/pending |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | $crud = new grocery_CRUD(); |
| 123 | 123 | $crud->set_table('new_account'); |
| 124 | 124 | $crud->set_subject('new_account', 'New Account'); |
| 125 | - $crud->display_as('ern','ER no.')->display_as('ext','Phone Number')->display_as('con_start','Contract Start')->display_as('con_end','Contract End'); |
|
| 125 | + $crud->display_as('ern', 'ER no.')->display_as('ext', 'Phone Number')->display_as('con_start', 'Contract Start')->display_as('con_end', 'Contract End'); |
|
| 126 | 126 | $crud->edit_fields('complete'); |
| 127 | 127 | $crud->unset_add(); |
| 128 | 128 | $crud->unset_read(); |
@@ -304,8 +304,8 @@ discard block |
||
| 304 | 304 | $this->email->to('[email protected]'); |
| 305 | 305 | $this->email->subject('Disable Staff Account'); |
| 306 | 306 | $this->email->message('A staff account needs to be disabled and has been requested by '.$_SESSION['username'].' |
| 307 | - Name: ' . $this->input->post('full_name') . ' |
|
| 308 | - Last Day: ' . $this->input->post('last') . ' |
|
| 307 | + Name: ' . $this->input->post('full_name').' |
|
| 308 | + Last Day: ' . $this->input->post('last').' |
|
| 309 | 309 | |
| 310 | 310 | By: ' . $_SESSION['ldap']['full_name'].' |
| 311 | 311 | |