mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-26 07:44:49 +02:00
Code Issues Releases Wiki Activity

Code cleanup.

Browse Source
This commit is contained in:
Cameron
2020-12-05 12:43:05 -08:00
parent 68e251d771
commit b16d7605b6
7 changed files with 142 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_plugins/banner/admin_banner.php
View File

@@ -156,7 +156,7 @@ class banner_ui extends e_admin_ui
// ------- Customize Create --------
public function beforeCreate($new_data)
public function beforeCreate($new_data, $old_data)
{
// e107::getMessage()->addDebug(print_a($new_data,true));
@@ -604,6 +604,8 @@ class banner_form_ui extends e_admin_form_ui
return $this->campaigns;
break;
}
return null;
}

152
e107_plugins/clock_menu/clock.js
View File

@@ -1,71 +1,93 @@
<!--
function tick(e107_datepref, e107_dateformat, e107_datesuff1, e107_datesuff2, e107_datesuff3, e107_datesuff4) {
function tick(e107_datepref,e107_dateformat,e107_datesuff1,e107_datesuff2,e107_datesuff3,e107_datesuff4) {
if(e107_datepref=='undefined'){e107_datepref = '';}
var hours, minutes, seconds, ap;
var intHours, intMinutes, intSeconds, today;
var intDay, intDate, intMonth, intYear, timeString;
today = new Date();
intDay = today.getDay();
intDate = today.getDate();
intMonth = today.getMonth();
intYear = today.getYear();
intHours = today.getHours();
intMinutes = today.getMinutes();
intSeconds = today.getSeconds();
timeString = DayNam[intDay]+" "+e107_datepref+" "+intDate;
if (intDate == 1 || intDate == 21 || intDate == 31) {
timeString= timeString + e107_datesuff1 + " ";
} else if (intDate == 2 || intDate == 22) {
timeString= timeString + e107_datesuff2 + " ";
} else if (intDate == 3 || intDate == 23) {
timeString= timeString + e107_datesuff3 + " ";
} else {
timeString = timeString + e107_datesuff4 + " ";
}
if (intYear < 2000){
intYear += 1900;
}
timeString = timeString+" "+MnthNam[intMonth]+" "+intYear;
if(e107_dateformat == 1){
if (intHours == 0) {
hours = "12:";
ap = "am.";
} else if (intHours < 12) {
hours = intHours+":";
ap = "am.";
} else if (intHours == 12) {
hours = "12:";
ap = "pm.";
} else {
intHours = intHours - 12
hours = intHours + ":";
ap = "pm.";
if (e107_datepref === undefined) {
e107_datepref = '';
}
}else{
if (intHours < 10) {
hours = "0" + intHours + ":";
} else {
hours = intHours + ":";
if (e107_datesuff1 === undefined) {
e107_datesuff1 = '';
}
ap = '';
}
if (intMinutes < 10) {
minutes = "0"+intMinutes;
} else {
minutes = intMinutes;
}
if (intSeconds < 10) {
seconds = ":0"+intSeconds;
} else {
seconds = ":"+intSeconds;
}
timeString = (document.all)? timeString+", "+hours+minutes+seconds+" "+ap:timeString+" "+hours+minutes+" "+ap;
var clock = (document.all) ? document.all("Clock") : document.getElementById("Clock");
clock.innerHTML = timeString;
(document.all)?window.setTimeout("tick('"+e107_datepref+"','"+e107_dateformat+"','"+e107_datesuff1+"','"+e107_datesuff2+"','"+e107_datesuff3+"','"+e107_datesuff4+"');", 1000):window.setTimeout("tick('"+e107_datepref+"','"+e107_dateformat+"','"+e107_datesuff1+"','"+e107_datesuff2+"','"+e107_datesuff3+"','"+e107_datesuff4+"');", 6000);
if (e107_datesuff2 === undefined) {
e107_datesuff2 = '';
}
if (e107_datesuff3 === undefined) {
e107_datesuff3 = '';
}
if (e107_datesuff4 === undefined) {
e107_datesuff4 = '';
}
var hours, minutes, seconds, ap;
var intHours, intMinutes, intSeconds, today;
var intDay, intDate, intMonth, intYear, timeString;
today = new Date();
intDay = today.getDay();
intDate = today.getDate();
intMonth = today.getMonth();
intYear = today.getYear();
intHours = today.getHours();
intMinutes = today.getMinutes();
intSeconds = today.getSeconds();
timeString = DayNam[intDay] + " " + e107_datepref + " " + intDate;
if (intDate == 1 || intDate == 21 || intDate == 31) {
timeString = timeString + e107_datesuff1 + " ";
} else if (intDate == 2 || intDate == 22) {
timeString = timeString + e107_datesuff2 + " ";
} else if (intDate == 3 || intDate == 23) {
timeString = timeString + e107_datesuff3 + " ";
} else {
timeString = timeString + e107_datesuff4 + " ";
}
if (intYear < 2000) {
intYear += 1900;
}
timeString = timeString + " " + MnthNam[intMonth] + " " + intYear;
if (e107_dateformat == 1) {
if (intHours == 0) {
hours = "12:";
ap = "am.";
} else if (intHours < 12) {
hours = intHours + ":";
ap = "am.";
} else if (intHours == 12) {
hours = "12:";
ap = "pm.";
} else {
intHours = intHours - 12
hours = intHours + ":";
ap = "pm.";
}
} else {
if (intHours < 10) {
hours = "0" + intHours + ":";
} else {
hours = intHours + ":";
}
ap = '';
}
if (intMinutes < 10) {
minutes = "0" + intMinutes;
} else {
minutes = intMinutes;
}
if (intSeconds < 10) {
seconds = ":0" + intSeconds;
} else {
seconds = ":" + intSeconds;
}
timeString = (document.all) ? timeString + ", " + hours + minutes + seconds + " " + ap : timeString + " " + hours + minutes + " " + ap;
var clock = (document.all) ? document.all("Clock") : document.getElementById("Clock");
clock.innerHTML = timeString;
(document.all) ? window.setTimeout("tick('" + e107_datepref + "','" + e107_dateformat + "','" + e107_datesuff1 + "','" + e107_datesuff2 + "','" + e107_datesuff3 + "','" + e107_datesuff4 + "');", 1000) : window.setTimeout("tick('" + e107_datepref + "','" + e107_dateformat + "','" + e107_datesuff1 + "','" + e107_datesuff2 + "','" + e107_datesuff3 + "','" + e107_datesuff4 + "');", 6000);
}
////tick();
tick();
//-->