diff --git a/modules/events/addedit.php b/modules/events/addedit.php index 79e23bf95..cb7baf8b3 100644 --- a/modules/events/addedit.php +++ b/modules/events/addedit.php @@ -17,7 +17,6 @@ } global $AppUI, $cal_sdf; -$AppUI->getTheme()->loadCalendarJS(); // get the passed timestamp (today if none) $date = w2PgetParam($_GET, 'date', null); diff --git a/modules/projectdesigner/index.php b/modules/projectdesigner/index.php index 578b55370..978c7b7db 100644 --- a/modules/projectdesigner/index.php +++ b/modules/projectdesigner/index.php @@ -35,8 +35,6 @@ $AppUI->redirect(ACCESS_DENIED); } -$AppUI->getTheme()->loadCalendarJS(); - $today = new w2p_Utilities_Date(); $today->addDays(1); $today->setHour($w2Pconfig['cal_day_start']); diff --git a/modules/projects/addedit.php b/modules/projects/addedit.php index 28221c04d..14cae987a 100644 --- a/modules/projects/addedit.php +++ b/modules/projects/addedit.php @@ -32,7 +32,6 @@ } global $AppUI, $cal_sdf; -$AppUI->getTheme()->loadCalendarJS(); $pstatus = w2PgetSysVal('ProjectStatus'); $ptype = w2PgetSysVal('ProjectType'); diff --git a/modules/projects/viewgantt.php b/modules/projects/viewgantt.php index 614d2bc66..18865e724 100644 --- a/modules/projects/viewgantt.php +++ b/modules/projects/viewgantt.php @@ -5,7 +5,6 @@ // @todo convert to template global $AppUI, $company_id, $dept_ids, $department, $min_view, $m, $a, $user_id, $tab, $cal_sdf; -$AppUI->getTheme()->loadCalendarJS(); $min_view = defVal($min_view, false); $project_id = w2PgetParam($_GET, 'project_id', 0); diff --git a/modules/reports/reports/allocateduserhours.php b/modules/reports/reports/allocateduserhours.php index 9a8f00a36..537eca4e3 100644 --- a/modules/reports/reports/allocateduserhours.php +++ b/modules/reports/reports/allocateduserhours.php @@ -5,7 +5,6 @@ // @todo convert to template global $AppUI, $cal_sdf; -$AppUI->getTheme()->loadCalendarJS(); $coarseness = w2PgetParam($_POST, 'coarseness', 1); $do_report = w2PgetParam($_POST, 'do_report', 0); diff --git a/modules/reports/reports/budgetcategorybyprojectcost.php b/modules/reports/reports/budgetcategorybyprojectcost.php index 4c07ecd02..ee712306a 100644 --- a/modules/reports/reports/budgetcategorybyprojectcost.php +++ b/modules/reports/reports/budgetcategorybyprojectcost.php @@ -5,7 +5,6 @@ // @todo convert to template global $AppUI, $cal_sdf; -$AppUI->getTheme()->loadCalendarJS(); $company_id = (int) w2PgetParam($_POST, 'company_id', 0); $active_projects = w2PgetParam($_POST, 'active_projects', 0); diff --git a/modules/reports/reports/costsbyproject.php b/modules/reports/reports/costsbyproject.php index 3904bdcdd..36957753f 100644 --- a/modules/reports/reports/costsbyproject.php +++ b/modules/reports/reports/costsbyproject.php @@ -5,7 +5,6 @@ // @todo convert to template global $AppUI, $cal_sdf; -$AppUI->getTheme()->loadCalendarJS(); $company_id = (int) w2PgetParam($_POST, 'company_id', 0); $active_projects = w2PgetParam($_POST, 'active_projects', 0); diff --git a/modules/reports/reports/costsbytask.php b/modules/reports/reports/costsbytask.php index 5f9b764f2..271da9f28 100644 --- a/modules/reports/reports/costsbytask.php +++ b/modules/reports/reports/costsbytask.php @@ -5,8 +5,7 @@ // @todo convert to template global $AppUI, $cal_sdf; -$AppUI->getTheme()->loadCalendarJS(); -//TODO: block execution unless I tell it to + /** * Generates a report of the task logs for given dates */ diff --git a/modules/reports/reports/overall.php b/modules/reports/reports/overall.php index 721d268ed..ffb4e66e0 100644 --- a/modules/reports/reports/overall.php +++ b/modules/reports/reports/overall.php @@ -5,7 +5,6 @@ // @todo convert to template global $AppUI, $cal_sdf; -$AppUI->getTheme()->loadCalendarJS(); /** * Generates a report of the task logs for given dates diff --git a/modules/reports/reports/taskenddate.php b/modules/reports/reports/taskenddate.php index 92e25a08f..0e98f2f7c 100644 --- a/modules/reports/reports/taskenddate.php +++ b/modules/reports/reports/taskenddate.php @@ -5,7 +5,6 @@ // @todo convert to template global $AppUI, $cal_sdf; -$AppUI->getTheme()->loadCalendarJS(); $do_report = w2PgetParam($_POST, 'do_report', 0); $log_start_date = w2PgetParam($_POST, 'log_start_date', 0); diff --git a/modules/reports/reports/tasklist.php b/modules/reports/reports/tasklist.php index 3153243ee..127c56b2a 100644 --- a/modules/reports/reports/tasklist.php +++ b/modules/reports/reports/tasklist.php @@ -5,7 +5,6 @@ // @todo convert to template global $AppUI, $cal_sdf; -$AppUI->getTheme()->loadCalendarJS(); /** * Generates a report of the task logs for given dates diff --git a/modules/reports/reports/tasklogs.php b/modules/reports/reports/tasklogs.php index 585975889..c92c71a14 100644 --- a/modules/reports/reports/tasklogs.php +++ b/modules/reports/reports/tasklogs.php @@ -8,7 +8,6 @@ * Generates a report of the task logs for given dates */ global $AppUI, $cal_sdf; -$AppUI->getTheme()->loadCalendarJS(); $perms = &$AppUI->acl(); if (!canView('task_log')) { diff --git a/modules/reports/reports/tasklogs_xp1.php b/modules/reports/reports/tasklogs_xp1.php index 32c7e9022..5f57ce13d 100644 --- a/modules/reports/reports/tasklogs_xp1.php +++ b/modules/reports/reports/tasklogs_xp1.php @@ -8,7 +8,6 @@ * Generates a report of the task logs for given dates */ global $AppUI, $cal_sdf; -$AppUI->getTheme()->loadCalendarJS(); $perms = &$AppUI->acl(); if (!canView('task_log')) { diff --git a/modules/reports/reports/tasksperuser.php b/modules/reports/reports/tasksperuser.php index d60311123..b98c337bb 100644 --- a/modules/reports/reports/tasksperuser.php +++ b/modules/reports/reports/tasksperuser.php @@ -5,7 +5,6 @@ // @todo convert to template global $AppUI, $cal_sdf; -$AppUI->getTheme()->loadCalendarJS(); $do_report = w2PgetParam($_POST, 'do_report', 0); $log_start_date = w2PgetParam($_POST, 'log_start_date', 0); diff --git a/modules/reports/reports/userperformance.php b/modules/reports/reports/userperformance.php index d24ef023c..6d937c6bd 100644 --- a/modules/reports/reports/userperformance.php +++ b/modules/reports/reports/userperformance.php @@ -5,7 +5,6 @@ // @todo convert to template global $AppUI, $cal_sdf; -$AppUI->getTheme()->loadCalendarJS(); $do_report = w2PgetParam($_POST, 'do_report', 0); $log_start_date = w2PgetParam($_POST, 'log_start_date', 0); diff --git a/modules/system/budgeting.php b/modules/system/budgeting.php index be24c4d7e..b1e0f4a7f 100644 --- a/modules/system/budgeting.php +++ b/modules/system/budgeting.php @@ -3,7 +3,6 @@ die('You should not access this file directly.'); } global $AppUI, $cal_sdf; -$AppUI->getTheme()->loadCalendarJS(); $budget_id = (int) w2PgetParam($_GET, 'budget_id', 0); diff --git a/modules/system/budgeting_allocated.php b/modules/system/budgeting_allocated.php index 0f5a38195..7895342ea 100644 --- a/modules/system/budgeting_allocated.php +++ b/modules/system/budgeting_allocated.php @@ -3,7 +3,6 @@ die('You should not access this file directly.'); } global $AppUI, $cal_sdf; -$AppUI->getTheme()->loadCalendarJS(); $budget_id = (int) w2PgetParam($_GET, 'budget_id', 0); diff --git a/modules/tasks/ae_dates.php b/modules/tasks/ae_dates.php index a11116994..79b014cd4 100644 --- a/modules/tasks/ae_dates.php +++ b/modules/tasks/ae_dates.php @@ -8,7 +8,6 @@ global $can_edit_time_information, $locale_char_set, $object; global $durnTypes, $task_project, $object_id, $tab; global $cal_sdf; -$AppUI->getTheme()->loadCalendarJS(); //Time arrays for selects $start = (int) w2PgetConfig('cal_day_start', 8); diff --git a/modules/tasks/tasksperuser_sub.php b/modules/tasks/tasksperuser_sub.php index d388a175d..eac2cb159 100644 --- a/modules/tasks/tasksperuser_sub.php +++ b/modules/tasks/tasksperuser_sub.php @@ -6,7 +6,6 @@ // @todo remove database query global $AppUI, $cal_sdf; -$AppUI->getTheme()->loadCalendarJS(); $do_report = w2PgetParam($_POST, 'do_report', true); $log_start_date = w2PgetParam($_POST, 'log_start_date', 0); diff --git a/modules/tasks/viewgantt.php b/modules/tasks/viewgantt.php index fb0898a2d..cdeef21e7 100644 --- a/modules/tasks/viewgantt.php +++ b/modules/tasks/viewgantt.php @@ -6,7 +6,6 @@ global $AppUI, $min_view, $m, $a, $user_id, $tab, $tasks, $cal_sdf; global $gantt_map, $currentGanttImgSource, $filter_task_list, $caller; -$AppUI->getTheme()->loadCalendarJS(); $min_view = defVal($min_view, false); diff --git a/modules/tasks/vw_log_update.php b/modules/tasks/vw_log_update.php index f0f5069ac..50eef8fa7 100644 --- a/modules/tasks/vw_log_update.php +++ b/modules/tasks/vw_log_update.php @@ -26,8 +26,6 @@ $AppUI->redirect(ACCESS_DENIED); } -$AppUI->getTheme()->loadCalendarJS(); - // check permissions $perms = &$AppUI->acl(); $canEditTask = $perms->checkModuleItem('tasks', 'edit', $obj->task_id); diff --git a/modules/users/vw_usr_log.php b/modules/users/vw_usr_log.php index f4a57f6ae..774ecc0af 100644 --- a/modules/users/vw_usr_log.php +++ b/modules/users/vw_usr_log.php @@ -15,7 +15,6 @@ $a = ($user_id) ? '&a=view&user_id=' . $user_id : ''; $a .= '&tab=' . $currentTabId . '&showdetails=1'; -$AppUI->getTheme()->loadCalendarJS(); ?>