PHP CodeStandard update

- all if/while/for/etc blocks have brackets on same line
- functions have brackets on new line
- no blocks without brackets
- all code starts on col 0 and there are no tab intends anymore

off: came case for classes and class methods
ignore: _ prefix functions (we can't change that anymore)
This commit is contained in:
2018-03-15 17:38:33 +09:00
parent 5226fbcfc3
commit 7d42256a30
42 changed files with 11623 additions and 12013 deletions

View File

@@ -15,416 +15,353 @@
padding: 0;
} */
body
{
body {
background-color: white;
color: black;
font-size : 8pt;
font-family: Verdana,Arial,Helvetica,sans-serif;
font-size : 8pt;
}
.large
{
.large {
font-family: Verdana,Arial,Helvetica,sans-serif;
font-size : 16pt;
font-family: Verdana,Arial,Helvetica,sans-serif;
}
.big
{
.big {
font-family: Verdana,Arial,Helvetica,sans-serif;
font-size : 12pt;
font-family: Verdana,Arial,Helvetica,sans-serif;
}
.normal
{
.normal {
font-family: Verdana,Arial,Helvetica,sans-serif;
font-size : 9pt;
font-family: Verdana,Arial,Helvetica,sans-serif;
}
.small
{
font-size : 8pt;
.small {
font-family: Verdana,Arial,Helvetica,sans-serif;
font-size : 8pt;
}
.smallbold
{
font-size : 8pt;
.smallbold {
font-family: Verdana,Arial,Helvetica,sans-serif;
font-size : 8pt;
font-weight: bold;
}
a:link
{
a:link {
color: #FF0000;
text-decoration: none;
}
a:active
{
a:active {
color: #FFFF00;
text-decoration: none;
}
a:visited
{
a:visited {
color: #550000;
text-decoration: none;
}
a:hover, a.item_loaded:hover, a.item_deleted:hover, a.item_loaded_deleted:hover
{
color: #FF0000;
a:hover, a.item_loaded:hover, a.item_deleted:hover, a.item_loaded_deleted:hover {
background-color: #e5e5e5;
border-bottom: 1px dotted red;
color: #FF0000;
}
a:focus, a.item_loaded:hover, a.item_deleted:hover, a.item_loaded_deleted:hover
{
color: #ff0000;
a:focus, a.item_loaded:hover, a.item_deleted:hover, a.item_loaded_deleted:hover {
background-color: #b3b3b3;
border-top: 1px dotted red;
border-bottom: 1px dotted red;
border-top: 1px dotted red;
color: #ff0000;
}
/* link highlight */
a.item_loaded
{
font-weight: bold;
color: #451010;
a.item_loaded {
background-color: #d5d6d6;
color: #451010;
font-weight: bold;
}
a.item_deleted
{
a.item_deleted {
text-decoration: line-through;
}
a.item_loaded_deleted
{
text-decoration: line-through;
font-weight: bold;
color: #451010;
a.item_loaded_deleted {
background-color: #d5d6d6;
color: #451010;
font-weight: bold;
text-decoration: line-through;
}
/* experimental */
input[type="text"]
{
border: 1px solid #999999;
input[type="text"] {
background-color: #efefef;
}
input[type="password"]
{
border: 1px solid #999999;
}
input[type="submit"]
{
input[type="password"] {
border: 1px solid #999999;
}
input[type="submit"] {
border: 1px solid #666666;
}
input[type="checkbox"]
{
input[type="checkbox"] {
border: 1px solid #999999;
}
input[type="radio"]
{
input[type="radio"] {
border: 1px solid #999999;
}
input[type="file"]
{
input[type="file"] {
border: 1px solid #999999;
}
input[type="button"]
{
input[type="button"] {
border: 1px solid #999999;
}
textarea
{
border: 1px solid #999999;
textarea {
background-color: #efefef;
border: 1px solid #999999;
}
select
{
border: 1px solid #999999;
select {
background-color: #efefef;
border: 1px solid #999999;
}
/* mouse over */
input[type=submit]:hover, input[type=button]:hover, input[type="text"]:hover, input[type="password"]:hover, input[type="checkbox"]:hover, input[type="radio"]:hover, input[type="file"]:hover, textarea:hover, select:hover
{
input[type=submit]:hover, input[type=button]:hover, input[type="text"]:hover, input[type="password"]:hover, input[type="checkbox"]:hover, input[type="radio"]:hover, input[type="file"]:hover, textarea:hover, select:hover {
border: 1px dashed red;
}
/* selected */
input[type=submit]:focus, input[type=button]:focus, input[type="password"]:focus, input[type="checkbox"]:focus, input[type="radio"]:focus, input[type="file"]:focus
{
border: 1px solid red;
input[type=submit]:focus, input[type=button]:focus, input[type="password"]:focus, input[type="checkbox"]:focus, input[type="radio"]:focus, input[type="file"]:focus {
background-color: #ffffff;
border: 1px solid red;
}
input[type="text"]:focus, textarea:focus, select:focus
{
border: 1px solid red;
input[type="text"]:focus, textarea:focus, select:focus {
background-color: #ffffff;
border: 1px solid red;
}
/* error & status layouts for messges */
.error
{
.error {
border: 1px solid red;
margin: 5px;
padding: 2px;
color: red;
margin: 5px;
padding: 2px;
text-align: center;
}
.warning
{
.warning {
border: 1px solid #df7700;
margin: 5px;
padding: 2px;
color: #d57200;
text-align: center;
}
.info
{
border: 1px solid #72C47E;
margin: 5px;
padding: 2px;
color: #1D731A;
text-align: center;
}
.div_error
{
border: 1px solid red;
margin-top: 1px;
margin-bottom: 1px;
.info {
border: 1px solid #72C47E;
color: #1D731A;
margin: 5px;
padding: 2px;
text-align: center;
}
.div_warning
{
.div_error {
border: 1px solid red;
margin-bottom: 1px;
margin-top: 1px;
}
.div_warning {
border: 1px solid #df7700;
}
/* borders */
.border_all
{
.border_all {
border: 1px solid black;
}
.border_bottom_title
{
font-weight: bold;
.border_bottom_title {
border-bottom: 1px solid black;
font-weight: bold;
}
.border_top
{
.border_top {
border-top: 1px solid #DCDCCC;
}
.border_all_error
{
.border_all_error {
border: 1px solid red;
}
.border_group
{
.border_group {
border: 1px solid #a89c5a;
}
.border_master
{
.border_master {
border: 1px solid white;
}
.border_sub
{
.border_sub {
border: 1px solid gray;
}
.border_sub_sub
{
.border_sub_sub {
border: 1px solid #e5ddba;
}
/* employee hardware/software borders */
.border_hardware
{
.border_hardware {
background-color: #e9e9e9;
border: 2px solid black;
background-color: #e9e9e9;
}
.border_hardware_usage_end
{
.border_hardware_usage_end {
background-color: #e9e9e9;
border: 2px solid red;
background-color: #e9e9e9;
}
.border_hardware_line
{
border-left: 2px solid black;
.border_hardware_line {
border-bottom: 2px solid black;
border-left: 2px solid black;
}
.border_software
{
border: 2px solid #a89c5a;
.border_software {
background-color: #d5d4c8;
border: 2px solid #a89c5a;
}
.border_software_line
{
border-left: 2px solid #a89c5a;
.border_software_line {
border-bottom: 2px solid #a89c5a;
border-left: 2px solid #a89c5a;
}
.border_software_line_left
{
.border_software_line_left {
border-left: 2px solid #a89c5a;
padding-bottom: 10px;
}
.border_software_line_bottom
{
.border_software_line_bottom {
border-bottom: 2px solid #a89c5a;
padding-left: 2px;
}
/* highlight */
.highlight
{
.highlight {
background-color: #e7e7e7;
font-weight: bold;
}
/* hide & show */
.visible
{
.visible {
visibility: visible;
}
.hidden
{
visibility: hidden;
.hidden {
display: none;
visibility: hidden;
}
/* spacer for line break in float elements */
div.spacer
{
.spacer {
clear: both;
}
/* unique definitions */
/* main body */
/* menu on top */
.menu
{
.menu {
border-bottom: 1px solid #a4a4a4;
font-size: 10px;
}
.pagename
{
text-align: center; font-size: 15px;
.pagename {
background-color: #e7e7e7;
font-size: 15px;
font-weight: bold;
padding: 5px;
text-align: center;
}
/* overlay side menu */
.sidemenu
{
border: 1px solid black;
.sidemenu {
background-color: white;
border: 1px solid black;
}
.buttongroup
{
.buttongroup {
border: 1px solid #e5ddba;
}
/* input group field */
/* normal */
.input_group
{
.input_group {
border: 1px solid #e5ddba;
}
/* loaded with id */
.input_group_id
{
.input_group_id {
border: 1px solid #8a7d3a;
}
/* deleted */
.input_group_deleted
{
border: 1px solid #8a7d3a;
.input_group_deleted {
background-color: #d5d4c8;
border: 1px solid #8a7d3a;
}
/* header part */
/* normal */
.input_group_header
{
.input_group_header {
background-color: #e9e9e9;
}
/* loaded with id */
.input_group_header_id
{
.input_group_header_id {
background-color: #d5d5d5;
}
/* deleted */
.input_group_header_deleted
{
.input_group_header_deleted {
background-color: #bfb59d;
}
/* error & warning messages */
.top_error_message
{
.top_error_message {
border: 2px solid red;
color: red;
font-size: 18px;
margin: 5px;
padding: 10px;
border: 2px solid red;
font-size: 18px;
text-align: center;
color: red;
}
.top_inventory_number
{
margin: 5px;
padding: 10px;
.top_inventory_number {
border: 2px solid orange;
font-size: 18px;
text-align: center;
}
.top_info_message
{
border: 2px solid green;
margin: 5px;
padding: 10px;
text-align: center;
font-size: 12px;
}
.debug_message
{
.top_info_message {
border: 2px solid green;
font-size: 12px;
margin: 5px;
padding: 10px;
text-align: center;
}
.debug_message {
border-top: 1px solid #a4a4a4;
color: #a4a4a4;
font-size: 8px;
@@ -434,78 +371,63 @@ div.spacer
/* set all colors here and not in the config file */
/* for edit interface */
.menu_bgcolor
{
.menu_bgcolor {
background-color: #666666;
}
.menu_fgcolor
{
.menu_fgcolor {
background-color: #DDDDDD;
}
.menu_fgcolor_na
{
.menu_fgcolor_na {
background-color: #CCCCCC;
}
.menu_fgcolor_a
{
.menu_fgcolor_a {
background-color: #EEEEEE;
}
.edit_bgcolor
{
.edit_bgcolor {
background-color: #666666;
}
.edit_fgcolor
{
.edit_fgcolor {
background-color: #FFFFDF;
}
.edit_fgcolor_mod_a
{
.edit_fgcolor_mod_a {
background-color: #CECEB5;
}
.edit_fgcolor_mod_b
{
.edit_fgcolor_mod_b {
background-color: #DEDEC3;
}
.edit_fgcolor_2
{
.edit_fgcolor_2 {
background-color: #AADAA2;
}
.edit_fgcolor_no
{
.edit_fgcolor_no {
background-color: #CECEB5;
}
.edit_fgcolor_alt
{
.edit_fgcolor_alt {
background-color: #CCCCCC;
}
.edit_fgcolor_delete
{
.edit_fgcolor_delete {
background-color: red;
}
.font_error
{
.font_error {
color: red;
}
.edit_fgcolor_special
{
.edit_fgcolor_special {
background-color: #EEEEEE;
}
.edit_temp
{
.edit_temp {
background-color: #FFDF6F;
}

View File

@@ -9,9 +9,8 @@
*/
// if debug is set to true, console log messages are printed
if (!DEBUG)
{
if (!DEBUG) {
$($H(window.console)).each(function(w) {
window.console[w.key] = function() {}
window.console[w.key] = function() {};
});
}

View File

@@ -6,50 +6,43 @@
* Some browser detection
*/
var clientPC = navigator.userAgent.toLowerCase(); // Get client info
var is_gecko = ((clientPC.indexOf('gecko') != -1) && (clientPC.indexOf('spoofer') == -1)
&& (clientPC.indexOf('khtml') == -1) && (clientPC.indexOf('netscape/7.0') == -1));
var is_gecko = ((clientPC.indexOf('gecko') != -1) && (clientPC.indexOf('spoofer') == -1) &&
(clientPC.indexOf('khtml') == -1) && (clientPC.indexOf('netscape/7.0') == -1));
var is_safari = ((clientPC.indexOf('AppleWebKit') != -1) && (clientPC.indexOf('spoofer') == -1));
var is_khtml = (navigator.vendor == 'KDE' || ( document.childNodes && !document.all && !navigator.taintEnabled ));
if (clientPC.indexOf('opera') != -1)
{
if (clientPC.indexOf('opera') != -1) {
var is_opera = true;
var is_opera_preseven = (window.opera && !document.childNodes);
var is_opera_seven = (window.opera && document.childNodes);
}
function pop(theURL, winName, features)
{
function pop(theURL, winName, features) {
winName = window.open(theURL, winName, features);
winName.focus();
}
function emd_check_checkbox()
{
for (i = 0; i < document.manage_emails.length; i ++)
{
if (document.manage_emails.elements[i].checked == false && document.manage_emails.elements[i].type == 'checkbox')
{
function emd_check_checkbox() {
for (i = 0; i < document.manage_emails.length; i ++) {
if (document.manage_emails.elements[i].checked == false && document.manage_emails.elements[i].type == 'checkbox') {
document.manage_emails.elements[i].checked = true;
}
}
}
function expandTA(ta_id)
{
function expandTA(ta_id) {
var ta;
// if a string comes, its a get by id, else use it as an element pass on
if (!ta_id.length)
if (!ta_id.length) {
ta = ta_id;
else
} else {
ta = document.getElementById(ta_id);
}
var maxChars = ta.cols;
var theRows = ta.value.split("\n");
var numNewRows = 0;
for ( var i = 0; i < theRows.length; i++ )
{
if ((theRows[i].length+2) > maxChars)
{
for ( var i = 0; i < theRows.length; i++ ) {
if ((theRows[i].length+2) > maxChars) {
numNewRows += Math.ceil( (theRows[i].length+2) / maxChars ) ;
}
}
@@ -62,27 +55,27 @@ function expandTA(ta_id)
// DESC: shows or hides the menu
function ShowHideMenu(status, id)
{
if (status == 'show')
{
if (status == 'show') {
document.getElementById(id).style.visibility = 'visible';
if (document.getElementById('search_results').innerHTML)
if (document.getElementById('search_results').innerHTML) {
document.getElementById('search_results').style.visibility = 'visible';
}
else if (status == 'hide')
{
}
} else if (status == 'hide') {
document.getElementById(id).style.visibility = 'hidden';
if (document.getElementById('search_results').style.visibility == 'visible')
if (document.getElementById('search_results').style.visibility == 'visible') {
document.getElementById('search_results').style.visibility = 'hidden';
}
}
}
function ShowHideDiv(id)
{
element = document.getElementById(id);
if (element.className == 'visible' || !element.className)
if (element.className == 'visible' || !element.className) {
element.className = 'hidden';
else
} else {
element.className = 'visible';
}
// alert('E: ' + element.className + ' -- ' + element.style.visibility);
}
@@ -100,14 +93,16 @@ function mv(id, direction)
function le(id)
{
document.forms[form_name].action.value = 'load';
if (load_id)
if (load_id) {
document.forms[form_name].action_yes.value = confirm('Do you want to load this data?');
else
} else {
document.forms[form_name].action_yes.value = 'true';
}
document.forms[form_name].action_id.value = id;
document.forms[form_name].action_menu.value = id;
if (document.forms[form_name].action_yes.value == 'true')
if (document.forms[form_name].action_yes.value == 'true') {
document.forms[form_name].submit();
}
}
// METHOD: getWindowSize
@@ -119,7 +114,10 @@ function getWindowSize()
var width, height;
width = window.innerWidth || (window.document.documentElement.clientWidth || window.document.body.clientWidth);
height = window.innerHeight || (window.document.documentElement.clientHeight || window.document.body.clientHeight);
return {width: width, height: height};
return {
width: width,
height: height
};
}
// METHOD: getScrollOffset
@@ -131,7 +129,10 @@ function getScrollOffset()
var left, top;
left = window.pageXOffset || (window.document.documentElement.scrollLeft || window.document.body.scrollLeft);
top = window.pageYOffset || (window.document.documentElement.scrollTop || window.document.body.scrollTop);
return {left: left, top: top};
return {
left: left,
top: top
};
}
// METHOD: setCenter
@@ -149,14 +150,12 @@ function setCenter(id, left, top)
// console.log('Id %s, type: %s, dimensions %s x %s, viewport %s x %s', id, $(id).getStyle('position'), dimensions.width, dimensions.height, viewport.width, viewport.height);
// console.log('Scrolloffset left: %s, top: %s', offset.left, offset.top);
// console.log('Left: %s, Top: %s (%s)', parseInt((viewport.width / 2) - (dimensions.width / 2) + offset.left), parseInt((viewport.height / 2) - (dimensions.height / 2) + offset.top), parseInt((viewport.height / 2) - (dimensions.height / 2)));
if (left)
{
if (left) {
$(id).setStyle ({
left: parseInt((viewport.width / 2) - (dimensions.width / 2) + offset.left) + 'px'
});
}
if (top)
{
if (top) {
// if we have fixed, we do not add the offset, else it moves out of the screen
var top_pos = type == 'fixed' ? parseInt((viewport.height / 2) - (dimensions.height / 2)) : parseInt((viewport.height / 2) - (dimensions.height / 2) + offset.top);
$(id).setStyle ({
@@ -178,15 +177,12 @@ function sh(id, showText, hideText)
// get status from element (hidden or visible)
divStatus = $(id).visible();
//console.log('Set flag %s for element %s', divStatus, id);
if (divStatus)
{
if (divStatus) {
// hide the element
Effect.BlindUp(id, {duration:0.3});
$(flag).value = 0;
$(btn).innerHTML = showText;
}
else if (!divStatus)
{
} else if (!divStatus) {
// show the element
Effect.BlindDown(id, {duration:0.3});
$(flag).value = 1;

View File

@@ -10,7 +10,7 @@ var ConsoleSetup = function() {
for (var i = 0; i < names.length; ++i) {
if (!window.console[names[i]]) {
window.console[names[i]] = function() {}
window.console[names[i]] = function() {};
}
}
}();