From 7fa2b81e29efd2813b569d616e61ba65903e5be8 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sat, 9 Aug 2014 20:29:21 -0400 Subject: [PATCH] Status section is now a panel, and padded tabbed sections --- admin/admin_settings.php | 3489 +++++++++++++++++++------------------- 1 file changed, 1742 insertions(+), 1747 deletions(-) diff --git a/admin/admin_settings.php b/admin/admin_settings.php index 67e9c50c..1f37ca6d 100644 --- a/admin/admin_settings.php +++ b/admin/admin_settings.php @@ -97,814 +97,761 @@ if ( defined('HESK_DEMO') ) ?> -
-
-
-
-
    -
    • -
-
-
- - - + + + + + + + + + + + + + +
- : - - - +
+
+
+
+ + + - - - - - - - - - - - - - -
+ : + + + ' . $hesklang['hud'] . ' '; - } - elseif ($latest != -1) - { - // Is this a beta/dev version? - if ( strpos($hesk_settings['hesk_version'], 'beta') || strpos($hesk_settings['hesk_version'], 'dev') ) - { - echo ' ' . $hesklang['beta'] . ' '; ?> ' . $hesklang['hnw'] . ' '; ?> - - -
- : - - -
- : - - -
- /hesk_settings.inc.php - - '.$hesklang['exists'].', '.$hesklang['writable'].''; - } else { - echo ''.$hesklang['exists'].', '.$hesklang['not_writable'].'
'.$hesklang['e_settings']; - } - ?> -
- / - - '.$hesklang['exists'].', '; - if (is_writable(HESK_PATH . $hesk_settings['attach_dir'])) - { - $enable_use_attachments=1; - echo ''.$hesklang['writable'].''; - } - else - { - echo ''.$hesklang['not_writable'].'
'.$hesklang['e_attdir']; - } - } - else - { - echo ''.$hesklang['no_exists'].', '.$hesklang['not_writable'].'
'.$hesklang['e_attdir']; - } - ?> -
-
-
-
- -
- =') && @ini_get('max_file_uploads') && @ini_get('max_file_uploads') < $hesk_settings['attachments']['max_number'] ) - { - hesk_show_notice($hesklang['fatte1']); - } - - // Check max attachment size - $tmp = @ini_get('upload_max_filesize'); - if ($tmp) - { - $last = strtoupper(substr($tmp,-1)); - - switch ($last) - { - case 'K': - $tmp = $tmp * 1024; - break; - case 'M': - $tmp = $tmp * 1048576; - break; - case 'G': - $tmp = $tmp * 1073741824; - break; - default: - $tmp = $tmp; - } - - if ($tmp < $hesk_settings['attachments']['max_size']) - { - hesk_show_notice($hesklang['fatte2']); - } - } - - // Check max post size - $tmp = @ini_get('post_max_size'); - if ($tmp) - { - $last = strtoupper(substr($tmp,-1)); - - switch ($last) - { - case 'K': - $tmp = $tmp * 1024; - break; - case 'M': - $tmp = $tmp * 1048576; - break; - case 'G': - $tmp = $tmp * 1073741824; - break; - default: - $tmp = $tmp; - } - - if ($tmp < ( $hesk_settings['attachments']['max_size'] * $hesk_settings['attachments']['max_number'] + 524288 ) ) - { - hesk_show_notice($hesklang['fatte3']); - } - } - } - - - $hesklang['err_custname'] = addslashes($hesklang['err_custname']); - - ?> - - -

-
- -
- -
    -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
- - -
- -
-
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- -
-
-
- -
- -   - -
-
-
- -
-
-
'; - ?> -
-
- -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - - - -
-
-
- - -
-
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
-
'; - ?> -
-
-
- -
-
-
'; - ?> -
-
- -
-
-
-
-
- -
-
    -
'; - ?> -
-
-
- -
-
    -
'; - ?> -
-
-
- -
-
    -
'; - ?> -
- -
- -
-
    -
'; - ?> -
- -
- -
-
    -
'; - ?> -
- - - -
-
- -
-
    -
'; - ?> -
-
-
- -
-
    -
'; - ?> -
- -
- -
-
    -
'; - ?> -
- -
- -
-
    -
'; - ?> -
- - - - -
-
- -
- -
-
    -
    -
- '; - - ?> -
- -  
- - :
- - ' . $hesklang['beta'] . ' '; ?> ' . $hesklang['hnw'] . ' '; ?> - - +
+ : + + +
+ : + + +
+ /hesk_settings.inc.php + + '.$hesklang['exists'].', '.$hesklang['writable'].''; + } else { + echo ''.$hesklang['exists'].', '.$hesklang['not_writable'].'
'.$hesklang['e_settings']; + } + ?> +
+ / + + '.$hesklang['exists'].', '; + if (is_writable(HESK_PATH . $hesk_settings['attach_dir'])) + { + $enable_use_attachments=1; + echo ''.$hesklang['writable'].''; + } + else + { + echo ''.$hesklang['not_writable'].'
'.$hesklang['e_attdir']; + } + } + else + { + echo ''.$hesklang['no_exists'].', '.$hesklang['not_writable'].'
'.$hesklang['e_attdir']; } ?> +
+
+
+
+
+

-

+ // Check file attachment limits + if ($hesk_settings['attachments']['use'] && ! defined('HESK_DEMO') ) + { + // Check number of attachments per post + if ( version_compare(phpversion(), '5.2.12', '>=') && @ini_get('max_file_uploads') && @ini_get('max_file_uploads') < $hesk_settings['attachments']['max_number'] ) + { + hesk_show_notice($hesklang['fatte1']); + } -
+ // Check max attachment size + $tmp = @ini_get('upload_max_filesize'); + if ($tmp) + { + $last = strtoupper(substr($tmp,-1)); -  
+ switch ($last) + { + case 'K': + $tmp = $tmp * 1024; + break; + case 'M': + $tmp = $tmp * 1048576; + break; + case 'G': + $tmp = $tmp * 1073741824; + break; + default: + $tmp = $tmp; + } - -
-  
+ if ($tmp < $hesk_settings['attachments']['max_size']) + { + hesk_show_notice($hesklang['fatte2']); + } + } - -
-  
+ // Check max post size + $tmp = @ini_get('post_max_size'); + if ($tmp) + { + $last = strtoupper(substr($tmp,-1)); - -
    -
'; - ?> + switch ($last) + { + case 'K': + $tmp = $tmp * 1024; + break; + case 'M': + $tmp = $tmp * 1048576; + break; + case 'G': + $tmp = $tmp * 1073741824; + break; + default: + $tmp = $tmp; + } -
+ if ($tmp < ( $hesk_settings['attachments']['max_size'] * $hesk_settings['attachments']['max_number'] + 524288 ) ) + { + hesk_show_notice($hesklang['fatte3']); + } + } + } -
+ + $hesklang['err_custname'] = addslashes($hesklang['err_custname']); + + ?> + + +

+
+ + + + + + +
+ +
+
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+
+ +
+ +   +
- + +
+
+
'; + ?> +
+
+ +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + + +
+
+
+ + +
+
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+
'; + ?> +
+
+
+ +
+
+
'; + ?> +
+
+ +
+
+
+
+
+ +
+
    +
'; + ?> +
+
+
+ +
+
    +
'; + ?> +
+
+
+ +
+
    +
'; + ?> +
+ +
+ +
+
    +
'; + ?> +
+ +
+ +
+
    +
'; + ?> +
+ + + +
+
+ +
+
    +
'; + ?> +
+
+
+ +
+
    +
'; + ?> +
+ +
+ +
+
    +
'; + ?> +
+ +
+ +
+
    +
'; + ?> +
+ + + + +
+
+ +
+
    +
    +
+ '; + + ?> +
+ +  
+ + :
+ +
    -
'; ?> - -
-  
-
-
-
-  
+

+

-
-
-  
+
+ +  
+ + +
+  
+ + +
+  
+ + +
    +
'; + ?> + +
-
-
-
-
- -
- -
- +
+
+ +
+
    +
'; + ?> + +
+  
+
+ +
+
+  
+ +
+
+  
+
-
- -
- +
+
+
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+
-
- -
-
- -
-
-
-
-
-
- -
- -
+
+
+
+
+ +
+ +
+ +
    +
+ -
    -
+   () + + + '.$hesklang['e_attach'].''; + } + ?> +
+
+
+ +
+ /> +
+
+
+ $hesklang['B'] . ' (' . $hesklang['bytes'] . ')', + 'kB' => $hesklang['kB'] . ' (' . $hesklang['kilobytes'] . ')', + 'MB' => $hesklang['MB'] . ' (' . $hesklang['megabytes'] . ')', + 'GB' => $hesklang['GB'] . ' (' . $hesklang['gigabytes'] . ')', + ); + $tmp = hesk_formatBytes($hesk_settings['attachments']['max_size'], 0); + list($size, $unit) = explode(' ', $tmp); + ?> + +
+ /> +
+
+ '.$hesklang['e_attach'].''; - } + ?> + /> +
+
+ +
+ +
+
+
+ +
+ +
+
    +
'; + ?> +
+
+
+ +
+
    +
'; + ?> +
+
+
+ +
+
    +
'; ?>
- -
- /> + +
+
    +
'; + ?>
- $hesklang['B'] . ' (' . $hesklang['bytes'] . ')', - 'kB' => $hesklang['kB'] . ' (' . $hesklang['kilobytes'] . ')', - 'MB' => $hesklang['MB'] . ' (' . $hesklang['megabytes'] . ')', - 'GB' => $hesklang['GB'] . ' (' . $hesklang['gigabytes'] . ')', - ); - $tmp = hesk_formatBytes($hesk_settings['attachments']['max_size'], 0); - list($size, $unit) = explode(' ', $tmp); - ?> - -
- /> -
-
- + +
+
    +
'; + ?>
- -
- /> + +
+
    +
'; + ?>
- -
- -
-
-
- -
- -
-
    -
'; - ?> -
-
-
- -
-
    -
'; - ?> -
- -
- -
-
    -
'; - ?> -
- -
- -
-
    -
'; - ?> -
- -
- -
-
    -
'; - ?> -
- -
- -
-
    -
'; - ?> -
- -
- -
-
    -
    -
- '; - ?> -
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-

-
-
-
-
- -
-
-

-
-
-
- -
- -
-
-

-
-
-
-
- -
-
-

-
-
- - - -
-
- - - - - - - - - - - - + +
+ -
- - - - - - - +
    +
    +
'; - } // End FOR - ?> -
- -
-

-
- 		- - - '.$hesklang['opt'].' -
-
+ ?> + + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+

+
+
+
+
+ +
+
+

+
+
+
+ +
+ +
+
+

+
+
+
+
+ +
+
+

+
+
+ - - -
-
-
- + +
+
+ + + + + + + + + + + + + + + + + + + + + '; + } // End FOR + ?> +
+ +
+

+
+ 		+ + + '.$hesklang['opt'].' +
+
+ + + +
+
+
+ +
+ +
+
    +
'; + ?> + + + + + + + + + + + +
+
+
- -
-
    -
'; - ?> - - - - - - - - - - - + +
+ />
-
-
- -
- /> -
-
-
- -
- /> -
-
-
- -
- /> -
-
-
- -
-
    -
'; - ?> -
-
-
- -
-
    -
'; - ?> -
-
-
- -
- autocomplete="off" /> -
-
-
- -
- autocomplete="off" /> -
-
-
-
- -
-
- - - - - - - -
- -
-
-
- + +
+ /> +
+
+
+ +
+ /> +
+
+
+
    -
'; +
    +
'; + ?> +
+ +
+ +
+
    +
'; ?>
- -
-
-
- + +
+ autocomplete="off" /> +
+
+
+ +
+ autocomplete="off" /> +
+
+
+
+ +
+
+ + + + + + + + + +
+
+ +
+ +
+
    +
'; + ?> +
+ + +
+
+ +
+ +
+
    +
'; + ?> + + + + + + +
+ +
+
+ +
+ /> +
+
+
+ +
+ /> +
+
+
+ +
+
    +
'; + ?> +
+
+
+ +
+
+
'; + ?> +
+ +
+ +
+ autocomplete="off" /> +
+
+
+ +
+ autocomplete="off" /> +
+
+
+
+ +
+
+ + + + + + + + + +
 
+ + + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+

+
+
+ +
+
+ +
+
    -
'; - ?> - - - - - - +
    +
'; + ?>
-
+
- +
- /> -
-
-
- -
- /> -
-
-
- -
-
    -
'; - ?> -
-
-
- -
-
-
'; - ?> -
-
-
- -
- autocomplete="off" /> -
-
-
- -
- autocomplete="off" /> -
-
-
-
- +
- - - - - +
 
- - - - - - - - - -
-
- -
- -
- -
-
-
- -
- -
-
-

-
-
- -
-
- -
- -
-
    -
'; - ?> -
- -
-
- -
- -
-
- - - - - -
-
-
-
- -
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
- - - -
-
-
- -
- -
-

'.$server_time.'' ; ?>

- -
-
-
-
- -
-
-

-
-
-
-
- -
-
-

-
-
-
-
- -
-
    -
'; - ?> -
-
-
- -
- -
-
-
- +
- +
- -
-
-
-
- -
-
- +
- -
-
- -
-
-
- -
-
-
- +
- +
- -
-
-
- -
- - - - - - - - - - - - - fetch_assoc()) - { - $checkedEcho = ($row['IsClosed'] == 1) ? 'checked="checked"' : ''; - $isDisabled = false; - if ($row['IsNewTicketStatus'] || $row['IsClosedByClient'] || $row['IsCustomerReplyStatus'] || - $row['IsStaffClosedOption'] || $row['IsStaffReopenedStatus'] || $row['IsDefaultStaffReplyStatus'] - || $row['LockedTicketStatus']) - { - $isDisabled = true; - } - - echo ''; - echo ''; //Name - echo ''; // Short Name Language File - echo ''; // Long Name Language File - echo ''; // Text Color - echo ''; // Resolved Status? - echo ''; //Delete status? - echo ''; - } - - //Print out an additional blank space for adding a status - echo ''; - echo ''; - echo ''; // Short Name Language File - echo ''; // Long Name Language File - echo ''; // Text Color - echo ''; // Resolved Status? - echo ''; //Empty placeholder where the delete row is. - echo ''; - ?> - -
'.$hesklang[$row['ShortNameContentKey']].''; - if ($isDisabled) - { - echo ''; - } else - { - echo ''; - } - echo '
'.$hesklang['addNew'].'
-
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
-
- - '; - } - else - { - echo '
'.$hesklang['e_save_settings'].''; - } - ?> + +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ + +
+
+
+ +
+ +
+

'.$server_time.'' ; ?>

+ +
+
+
+
+
+ +
+
+

+
+
+
+
+ +
+
+

- -
+
+ +
+
    +
'; + ?> +
+ +
+ +
+ +
+
+ +
+
+ +
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+ +
+
+
+ +
+
+ +
+
+
+ +
+
+
+ +
+ + + + + + + + + + + + + fetch_assoc()) + { + $checkedEcho = ($row['IsClosed'] == 1) ? 'checked="checked"' : ''; + $isDisabled = false; + if ($row['IsNewTicketStatus'] || $row['IsClosedByClient'] || $row['IsCustomerReplyStatus'] || + $row['IsStaffClosedOption'] || $row['IsStaffReopenedStatus'] || $row['IsDefaultStaffReplyStatus'] + || $row['LockedTicketStatus']) + { + $isDisabled = true; + } + + echo ''; + echo ''; //Name + echo ''; // Short Name Language File + echo ''; // Long Name Language File + echo ''; // Text Color + echo ''; // Resolved Status? + echo ''; //Delete status? + echo ''; + } + + //Print out an additional blank space for adding a status + echo ''; + echo ''; + echo ''; // Short Name Language File + echo ''; // Long Name Language File + echo ''; // Text Color + echo ''; // Resolved Status? + echo ''; //Empty placeholder where the delete row is. + echo ''; + ?> + +
'.$hesklang[$row['ShortNameContentKey']].''; + if ($isDisabled) + { + echo ''; + } else + { + echo ''; + } + echo '
'.$hesklang['addNew'].'
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+ + '; + } + else + { + echo '
'.$hesklang['e_save_settings'].''; + } + ?> +
+
+ + +