[REFACTOR] Remove Explicit Include/Require

papayaCMS · Oct 26, 2021 · 2d32f2a · 2d32f2a
1 parent 48124ac
commit 2d32f2a
Show file tree

Hide file tree

Showing 22 changed files with 13 additions and 167 deletions.
diff --git a/src/Feed/Configuration.php b/src/Feed/Configuration.php
@@ -88,7 +88,6 @@ public function __construct($owner) {
   */
   public function getBaseModuleOptionsObject() {
     if (!is_object($this->_baseModuleOptionsObject)) {
-      include_once(PAPAYA_INCLUDE_PATH.'system/base_module_options.php');
       $this->_baseModuleOptionsObject = new base_module_options();
     }
     return $this->_baseModuleOptionsObject;

diff --git a/src/Feed/Fetcher.php b/src/Feed/Fetcher.php
@@ -41,7 +41,6 @@ public function loadFeed($url) {
       libxml_clear_errors();
       $dom = new PapayaXmlDocument();
       if ($dom->loadXml($feedContents)) {
-        include_once(PAPAYA_INCLUDE_PATH.'system/xml/feeds/atom/papaya_atom_feed.php');
         $feed = new papaya_atom_feed();
         if ($feed->load($dom, $url)) {
           $result = $feed;
@@ -119,4 +118,4 @@ public function fetchInto(PapayaXmlElement $parent,
     }
     return ($counter >= $min && $counter > 0);
   }
-}
+}
diff --git a/src/Robot.php b/src/Robot.php
@@ -16,11 +16,6 @@
 * @version $Id: Robot.php 2 2013-12-09 15:38:42Z weinert $
 */
 
-/**
-* Load necessary libraries
-*/
-require_once(PAPAYA_INCLUDE_PATH.'system/base_cronjob.php');
-
 /**
 * Cron job module for creating and sending mailings automatically.
 *

diff --git a/src/UserProfile.php b/src/UserProfile.php
@@ -16,11 +16,6 @@
 * @version $Id: UserProfile.php 2 2013-12-09 15:38:42Z weinert $
 */
 
-/**
-* Basic class page module
-*/
-require_once PAPAYA_INCLUDE_PATH.'system/base_content.php';
-
 /**
 * Newsletter user profile page module.
 *

diff --git a/src/UserProfile/Base.php b/src/UserProfile/Base.php
@@ -158,7 +158,6 @@ public function getPageObject() {
     } elseif (isset($GLOBALS['PAPAYA_PAGE']) && $GLOBALS['PAPAYA_PAGE'] instanceof papaya_page) {
       $result = $GLOBALS['PAPAYA_PAGE'];
     } else {
-      include_once(PAPAYA_INCLUDE_PATH.'system/papaya_page.php');
       $result = new papaya_page;
     }
     return $result;
@@ -306,7 +305,6 @@ public function sendEmailReport($receiver, $lists, $newSubscriptions = array(),
         'SALUTATION' => $salutation
       );
       // generate email and send it
-      include_once(PAPAYA_INCLUDE_PATH.'system/sys_email.php');
       $emailObj = new email();
       $emailObj->setSender($this->data['senderEMail'], $this->data['senderName']);
       $emailObj->setSubject($this->data['mailSubject']);

diff --git a/src/actbox_newsletter_subscribe.php b/src/actbox_newsletter_subscribe.php
@@ -16,8 +16,6 @@
 * @version $Id: actbox_newsletter_subscribe.php 6 2014-02-13 15:40:43Z SystemVCS $
 */
 
-require_once(PAPAYA_INCLUDE_PATH.'system/base_actionbox.php');
-
 /**
 * Newsletter Box to subscribe to a Newsletter.
 *
@@ -225,7 +223,6 @@ function getForm($dialogTitlePrefix = '', $dialogIcon = '') {
   */
   function getContentToolbar() {
     $contentMode = empty($this->params['contentmode']) ? 0 : (int)$this->params['contentmode'];
-    include_once(PAPAYA_INCLUDE_PATH.'system/base_btnbuilder.php');
     $toolbar = new base_btnbuilder;
     $toolbar->images = $GLOBALS['PAPAYA_IMAGES'];
     $toolbar->addButton(
@@ -505,7 +502,6 @@ function getParsedData() {
                 $this->newsletterObject->addProtocolEntry(
                   $subscriberId, $newsletterListId, 0, $token, FALSE, $subscriberData);
                 //send confirmation request email
-                include_once(PAPAYA_INCLUDE_PATH.'system/sys_email.php');
                 $email = new email();
 
                 $email->setSender($this->data['mail_from'], $this->data['addresser_name']);
@@ -590,7 +586,6 @@ function getURLParams($paramNames) {
 
   function initializeOutputForm() {
     if (!(isset($this->subscribeDialog) && is_object($this->subscribeDialog))) {
-      include_once(PAPAYA_INCLUDE_PATH.'system/base_dialog.php');
       $data = array();
       $hidden = array(
         'cmd' => 'subscribe'
@@ -717,4 +712,3 @@ function getOutputForm() {
     return $this->subscribeDialog->getDialogXML();
   }
 }
-
diff --git a/src/admin_newsletter_import.php b/src/admin_newsletter_import.php
@@ -222,7 +222,6 @@ function getForm() {
   * @return toolbar string
   */
   function getContentToolbar() {
-    include_once(PAPAYA_INCLUDE_PATH.'system/base_btnbuilder.php');
     $toolbar = new base_btnbuilder;
     $toolbar->images = $GLOBALS['PAPAYA_IMAGES'];
 
@@ -277,7 +276,6 @@ function getContentToolbar() {
   */
   function initializeDialog() {
     if (!@is_object($this->dialog)) {
-      include_once(PAPAYA_INCLUDE_PATH.'system/base_dialog.php');
       if (isset($this->parentObj) && is_object($this->parentObj)) {
         $hidden['page_id'] = $this->parentObj->topicId;
       }
@@ -517,7 +515,6 @@ function &getItemRef($id = '') {
   * @return string dialog
   */
   function getDialog() {
-    include_once(PAPAYA_INCLUDE_PATH.'system/base_dialog.php');
     $hidden = array(
       'contentmode' => @$this->params['contentmode'],
       'cmd'         => @$this->params['cmd'],
@@ -555,7 +552,6 @@ function getDialog() {
   * @return string dialog
   */
   function getIntroFooterDialog() {
-    include_once(PAPAYA_INCLUDE_PATH.'system/base_dialog.php');
     $hidden = array(
       'contentmode' => @$this->params['contentmode'],
       'cmd'         => @$this->params['cmd'],
@@ -597,7 +593,6 @@ function getIntroFooterDialog() {
   * @return string dialog
   */
   function getDelDialog() {
-    include_once(PAPAYA_INCLUDE_PATH.'system/base_msgdialog.php');
     $hidden = array(
       'contentmode' => @$this->params['contentmode'],
       'cmd'         => 'del',
@@ -743,7 +738,6 @@ function moveUp() {
   * @return string dialog
   */
   function getImportDialog() {
-    include_once(PAPAYA_INCLUDE_PATH.'system/base_msgdialog.php');
     $hidden = array(
       'contentmode'    => @$this->params['contentmode'],
       'cmd'            => 'import',
@@ -1057,4 +1051,3 @@ function loadMailingContents($mailingsId) {
     return FALSE;
   }
 }
-
diff --git a/src/base_newsletter.php b/src/base_newsletter.php
@@ -16,11 +16,6 @@
 * @version $Id: base_newsletter.php 11 2014-02-19 18:24:09Z SystemVCS $
 */
 
-/**
-* Base class for database access
-*/
-require_once(PAPAYA_INCLUDE_PATH.'system/sys_base_db.php');
-
 /**
 * Newsletter administration
 *
@@ -884,7 +879,6 @@ function requestConfirmation($data, $action, $newsletterListId = NULL) {
         $this->setSubscriberToken($this->subscriber['subscriber_id'], $token);
       }
 
-      include_once(PAPAYA_INCLUDE_PATH.'system/sys_email.php');
       $emailObj = new email();
       $emailObj->setSender($this->module->data['mail_from'], $this->module->data['addresser_name']);
       $emailObj->setSubject($data['mail_subject'], $data);
@@ -981,4 +975,3 @@ function loadOneMailingOutput($mailingoutputId) {
     }
   }
 }
-
diff --git a/src/base_newsletter_queue.php b/src/base_newsletter_queue.php
@@ -16,10 +16,6 @@
 * @version $Id: base_newsletter_queue.php 2 2013-12-09 15:38:42Z weinert $
 */
 
-/**
-* Base class for database access
-*/
-require_once(dirname(__FILE__).'/base_newsletter.php');
 
 /**
 * Newsletter queue handling
@@ -193,7 +189,6 @@ function prepareQueueEmail($queueId) {
   * @return boolean
   */
   function sendNewsletterMail($data, $fillValues) {
-    include_once(PAPAYA_INCLUDE_PATH.'system/sys_email.php');
     $emailObj = new email;
     $emailObj->setSubject($data['subject'], $fillValues);
     if ($data['text']) {
@@ -232,7 +227,6 @@ public function moduleOptions(base_module_options $moduleOptions = NULL) {
       $this->_moduleOptions = $moduleOptions;
     }
     if (is_null($this->_moduleOptions)) {
-      include_once(PAPAYA_INCLUDE_PATH.'system/base_module_options.php');
       $this->_moduleOptions = base_module_options::getInstance();
     }
     return $this->_moduleOptions;

diff --git a/src/bayesian.php b/src/bayesian.php
@@ -17,7 +17,6 @@
 */
 
 require_once(dirname(__FILE__).'/bayesian_db.php');
-require_once(PAPAYA_INCLUDE_PATH.'system/sys_base_object.php');
 
 /**
 * implementation of a bayesian filter
@@ -328,4 +327,3 @@ function rateMessage($content, $category) {
     }
   }
 }
-
diff --git a/src/connector_newsletter.php b/src/connector_newsletter.php
@@ -16,11 +16,6 @@
 * @version $Id: connector_newsletter.php 6 2014-02-13 15:40:43Z SystemVCS $
 */
 
-/**
-* Basic class plugin
-*/
-require_once(PAPAYA_INCLUDE_PATH.'system/base_plugin.php');
-
 /**
 * Basic class newsletter
 */
@@ -314,4 +309,3 @@ function callbackMailingListsCombo($name, $element, $data, $paramName = NULL) {
     return $result;
   }
 }
-
diff --git a/src/content_newsletter_import.php b/src/content_newsletter_import.php
@@ -16,11 +16,6 @@
 * @version $Id: content_newsletter_import.php 13 2014-02-20 12:13:35Z SystemVCS $
 */
 
-/**
-* Basic class page module
-*/
-require_once(PAPAYA_INCLUDE_PATH.'system/base_content.php');
-
 /**
 * Page module import newsletter
 *

diff --git a/src/content_newsletter_subscribe.php b/src/content_newsletter_subscribe.php
@@ -16,11 +16,6 @@
 * @version $Id: content_newsletter_subscribe.php 6 2014-02-13 15:40:43Z SystemVCS $
 */
 
-/**
-* Basic class page module
-*/
-require_once(PAPAYA_INCLUDE_PATH.'system/base_content.php');
-
 /**
 * Page module newsletter
 *
@@ -268,7 +263,6 @@ function getForm($dialogTitlePrefix = '', $dialogIcon = '') {
   * @return string XML
   */
   function getContentToolbar() {
-    include_once(PAPAYA_INCLUDE_PATH.'system/base_btnbuilder.php');
     $toolbar = new base_btnbuilder;
     $toolbar->images = $GLOBALS['PAPAYA_IMAGES'];
     $toolbar->addButton(
@@ -545,7 +539,6 @@ function getParsedData($parseParams = NULL) {
                 $this->newsletterObject->addProtocolEntry(
                   $subscriberId, $newsletterListId, 0, $token, FALSE, $subscriberData);
                 //send confirmation request email
-                include_once(PAPAYA_INCLUDE_PATH.'system/sys_email.php');
                 $email = new email();
 
                 $email->setSender($this->data['mail_from'], $this->data['addresser_name']);
@@ -670,7 +663,6 @@ function getURLParams($paramNames) {
 
   function initializeOutputForm() {
     if (!(isset($this->subscribeDialog) && is_object($this->subscribeDialog))) {
-      include_once(PAPAYA_INCLUDE_PATH.'system/base_dialog.php');
       $data = array();
       $hidden = array(
         'cmd' => 'subscribe'
@@ -793,4 +785,3 @@ function getOutputForm() {
   }
 
 }
-
diff --git a/src/content_newsletter_unsubscribe.php b/src/content_newsletter_unsubscribe.php
@@ -16,11 +16,6 @@
 * @version $Id: content_newsletter_unsubscribe.php 8 2014-02-17 16:54:45Z SystemVCS $
 */
 
-/**
-* Basic class page module
-*/
-require_once(PAPAYA_INCLUDE_PATH.'system/base_content.php');
-
 /**
 * Page module LinkDB
 *
@@ -115,7 +110,6 @@ function getParsedTeaser($parseParams = NULL) {
   */
   function getParsedData($parseParams = NULL) {
     $this->setDefaultData();
-    include_once(PAPAYA_INCLUDE_PATH.'system/base_dialog.php');
     include_once(dirname(__FILE__).'/base_newsletter.php');
     $newsletterObject = new base_newsletter();
     $newsletterObject->module = $this;
@@ -158,7 +152,7 @@ function getParsedData($parseParams = NULL) {
             $this->getWebLink(NULL, NULL, NULL, $params)
           );
           $replValues['LINK'] = $this->getAbsoluteURL($this->getWebLink(NULL, NULL, NULL, $params));
-          include_once(PAPAYA_INCLUDE_PATH.'system/sys_email.php');
+
           $email = new email();
           $email->setSender($this->data['mail_from'], $this->data['addresser_name']);
           $email->addAddress(
@@ -379,4 +373,3 @@ private function getTokenParameters() {
     return NULL;
   }
 }
-
diff --git a/src/cronjob_mailbox_reader.php b/src/cronjob_mailbox_reader.php
@@ -17,11 +17,6 @@
 * @version $Id: cronjob_mailbox_reader.php 2 2013-12-09 15:38:42Z weinert $
 */
 
-/**
-* Basic class cronjobs
-*/
-require_once(PAPAYA_INCLUDE_PATH.'system/base_cronjob.php');
-
 /**
 * Implements the access to an external mailbox account. Read-Only access.
 *

diff --git a/src/cronjob_newsletter_send.php b/src/cronjob_newsletter_send.php
@@ -16,11 +16,6 @@
 * @version $Id: cronjob_newsletter_send.php 2 2013-12-09 15:38:42Z weinert $
 */
 
-/**
-* Basic class cronjobs
-*/
-require_once(PAPAYA_INCLUDE_PATH.'system/base_cronjob.php');
-
 /**
 * Cronjob-module, send queued newsletters
 *
@@ -69,4 +64,3 @@ function checkExecParams() {
     return FALSE;
   }
 }
-
diff --git a/src/edmodule_newsletter.php b/src/edmodule_newsletter.php
@@ -16,11 +16,6 @@
 * @version $Id: edmodule_newsletter.php 13 2014-02-20 12:13:35Z SystemVCS $
 */
 
-/**
-* Basisklasse Aenderungsmodule
-*/
-require_once(PAPAYA_INCLUDE_PATH.'system/base_module.php');
-
 /**
 * Edit module for the newsletter application
 *
@@ -120,7 +115,6 @@ function callbackOutputModes($name, $field, $data) {
     if (empty($data) && isset($this->parentObj) && isset($this->parentObj->viewLink)) {
       $data = $this->parentObj->viewLink['viewmode_ext'];
     }
-    include_once(PAPAYA_INCLUDE_PATH.'system/base_viewlist.php');
     $viewList = new base_viewlist();
     $viewList->loadViewModesList();
     if (isset($viewList->viewModes) && is_array($viewList->viewModes)) {

diff --git a/src/newsletter_bounce_db.php b/src/newsletter_bounce_db.php
@@ -16,11 +16,6 @@
 * @version $Id: newsletter_bounce_db.php 2 2013-12-09 15:38:42Z weinert $
 */
 
-/**
- * Database access
- */
-require_once(PAPAYA_INCLUDE_PATH.'/system/sys_base_db.php');
-
 /**
 * {%SHORT_CLASS_DESCRIPTION%}
 *