*5256* Reduce include path to a single entry and change all import st…

…atements
pkp · May 3, 2010 · d96690d · d96690d
1 parent fa0a209
commit d96690d
Show file tree

Hide file tree

Showing 297 changed files with 809 additions and 808 deletions.
diff --git a/classes/admin/form/ConferenceSiteSettingsForm.inc.php b/classes/admin/form/ConferenceSiteSettingsForm.inc.php
@@ -14,8 +14,8 @@
 
 //$Id$
 
-import('db.DBDataXMLParser');
-import('form.Form');
+import('lib.pkp.classes.db.DBDataXMLParser');
+import('lib.pkp.classes.form.Form');
 
 class ConferenceSiteSettingsForm extends Form {
 
@@ -141,7 +141,7 @@ function execute() {
 			}
 
 			// Make the file directories for the conference
-			import('file.FileManager');
+			import('lib.pkp.classes.file.FileManager');
 			FileManager::mkdir(Config::getVar('files', 'files_dir') . '/conferences/' . $conferenceId);
 			FileManager::mkdir(Config::getVar('files', 'files_dir') . '/conferences/' . $conferenceId . '/schedConfs');
 			FileManager::mkdir(Config::getVar('files', 'public_files_dir') . '/conferences/' . $conferenceId);
@@ -163,7 +163,7 @@ function execute() {
 			));
 
 			// Install the default RT versions.
-			import('rt.ocs.ConferenceRTAdmin');
+			import('classes.rt.ocs.ConferenceRTAdmin');
 			$conferenceRtAdmin = new ConferenceRTAdmin($conferenceId);
 			$conferenceRtAdmin->restoreVersions(false);
 		}

diff --git a/classes/admin/form/ImportOCS1Form.inc.php b/classes/admin/form/ImportOCS1Form.inc.php
@@ -14,8 +14,8 @@
 
 //$Id$
 
-import('site.ImportOCS1');
-import('form.Form');
+import('classes.site.ImportOCS1');
+import('lib.pkp.classes.form.Form');
 
 class ImportOCS1Form extends Form {
 

diff --git a/classes/admin/form/SiteSettingsForm.inc.php b/classes/admin/form/SiteSettingsForm.inc.php
@@ -16,7 +16,7 @@
 // $Id$
 
 
-import('admin.form.PKPSiteSettingsForm');
+import('lib.pkp.classes.admin.form.PKPSiteSettingsForm');
 
 class SiteSettingsForm extends PKPSiteSettingsForm {
 

diff --git a/classes/announcement/Announcement.inc.php b/classes/announcement/Announcement.inc.php
@@ -17,7 +17,7 @@
  * @brief Basic class describing a announcement.
  *
  */
-import('announcement.PKPAnnouncement');
+import('lib.pkp.classes.announcement.PKPAnnouncement');
 
 class Announcement extends PKPAnnouncement {
 }

diff --git a/classes/announcement/AnnouncementDAO.inc.php b/classes/announcement/AnnouncementDAO.inc.php
@@ -15,8 +15,8 @@
 
 // $Id$
 
-import('announcement.Announcement');
-import('announcement.PKPAnnouncementDAO');
+import('classes.announcement.Announcement');
+import('lib.pkp.classes.announcement.PKPAnnouncementDAO');
 
 class AnnouncementDAO extends PKPAnnouncementDAO {
 

diff --git a/classes/announcement/AnnouncementType.inc.php b/classes/announcement/AnnouncementType.inc.php
@@ -15,7 +15,7 @@
 
 //$Id$
 
-import('announcement.PKPAnnouncementType');
+import('lib.pkp.classes.announcement.PKPAnnouncementType');
 
 class AnnouncementType extends PKPAnnouncementType {
 

diff --git a/classes/announcement/AnnouncementTypeDAO.inc.php b/classes/announcement/AnnouncementTypeDAO.inc.php
@@ -15,8 +15,8 @@
 
 //$Id$
 
-import('announcement.AnnouncementType');
-import('announcement.PKPAnnouncementTypeDAO');
+import('classes.announcement.AnnouncementType');
+import('lib.pkp.classes.announcement.PKPAnnouncementTypeDAO');
 
 class AnnouncementTypeDAO extends PKPAnnouncementTypeDAO {
 

diff --git a/classes/author/form/submit/AuthorSubmitForm.inc.php b/classes/author/form/submit/AuthorSubmitForm.inc.php
@@ -20,7 +20,7 @@
 // $Id$
 
 
-import('form.Form');
+import('lib.pkp.classes.form.Form');
 
 class AuthorSubmitForm extends Form {
 
@@ -91,12 +91,12 @@ function display() {
 
 	function confirmSubmission(&$paper, &$user, &$schedConf, &$conference, $mailTemplate = 'SUBMISSION_ACK') {
 		// Update search index
-		import('search.PaperSearchIndex');
+		import('classes.search.PaperSearchIndex');
 		PaperSearchIndex::indexPaperMetadata($paper);
 		PaperSearchIndex::indexPaperFiles($paper);
 
 		// Send author notification email
-		import('mail.PaperMailTemplate');
+		import('classes.mail.PaperMailTemplate');
 		$mail = new PaperMailTemplate($paper, $mailTemplate, null, null, null, null, false);
 		$mail->setFrom($schedConf->getSetting('contactEmail'), $schedConf->getSetting('contactName'));
 		if ($mail->isEnabled()) {

diff --git a/classes/author/form/submit/AuthorSubmitStep1Form.inc.php b/classes/author/form/submit/AuthorSubmitStep1Form.inc.php
@@ -14,7 +14,7 @@
 
 //$Id$
 
-import("author.form.submit.AuthorSubmitForm");
+import('classes.author.form.submit.AuthorSubmitForm');
 
 class AuthorSubmitStep1Form extends AuthorSubmitForm {
 

diff --git a/classes/author/form/submit/AuthorSubmitStep2Form.inc.php b/classes/author/form/submit/AuthorSubmitStep2Form.inc.php
@@ -14,7 +14,7 @@
 
 //$Id$
 
-import("author.form.submit.AuthorSubmitForm");
+import('classes.author.form.submit.AuthorSubmitForm');
 
 class AuthorSubmitStep2Form extends AuthorSubmitForm {
 	/**
@@ -67,7 +67,7 @@ function display() {
 	 * @return boolean
 	 */
 	function uploadSubmissionFile($fileName) {
-		import("file.PaperFileManager");
+		import('classes.file.PaperFileManager');
 
 		$paperFileManager = new PaperFileManager($this->paperId);
 		$paperDao =& DAORegistry::getDAO('PaperDAO');

diff --git a/classes/author/form/submit/AuthorSubmitStep3Form.inc.php b/classes/author/form/submit/AuthorSubmitStep3Form.inc.php
@@ -14,7 +14,7 @@
 
 //$Id$
 
-import("author.form.submit.AuthorSubmitForm");
+import('classes.author.form.submit.AuthorSubmitForm');
 
 class AuthorSubmitStep3Form extends AuthorSubmitForm {
 	/**
@@ -265,8 +265,8 @@ function execute() {
 		// Log the submission, even though it may not be "complete"
 		// at this step. This is important because we don't otherwise
 		// capture changes in review process.
-		import('paper.log.PaperLog');
-		import('paper.log.PaperEventLogEntry');
+		import('classes.paper.log.PaperLog');
+		import('classes.paper.log.PaperEventLogEntry');
 		PaperLog::logEvent($this->paperId, PAPER_LOG_ABSTRACT_SUBMIT, LOG_TYPE_AUTHOR, $user->getId(), 'log.author.abstractSubmitted', array('submissionId' => $paper->getId(), 'authorName' => $user->getFullName()));
 		return $this->paperId;
 	}

diff --git a/classes/author/form/submit/AuthorSubmitStep4Form.inc.php b/classes/author/form/submit/AuthorSubmitStep4Form.inc.php
@@ -14,7 +14,7 @@
 
 //$Id$
 
-import("author.form.submit.AuthorSubmitForm");
+import('classes.author.form.submit.AuthorSubmitForm');
 
 class AuthorSubmitStep4Form extends AuthorSubmitForm {
 	/**

diff --git a/classes/author/form/submit/AuthorSubmitStep5Form.inc.php b/classes/author/form/submit/AuthorSubmitStep5Form.inc.php
@@ -14,7 +14,7 @@
 
 //$Id$
 
-import("author.form.submit.AuthorSubmitForm");
+import('classes.author.form.submit.AuthorSubmitForm');
 
 class AuthorSubmitStep5Form extends AuthorSubmitForm {
 
@@ -88,8 +88,8 @@ function execute() {
 
 		$this->confirmSubmission($paper, $user, $schedConf, $conference, $reviewMode == REVIEW_MODE_BOTH_SEQUENTIAL?'SUBMISSION_UPLOAD_ACK':'SUBMISSION_ACK');
 
-		import('paper.log.PaperLog');
-		import('paper.log.PaperEventLogEntry');
+		import('classes.paper.log.PaperLog');
+		import('classes.paper.log.PaperEventLogEntry');
 		PaperLog::logEvent($this->paperId, PAPER_LOG_PRESENTATION_SUBMIT, LOG_TYPE_AUTHOR, $user->getId(), 'log.author.presentationSubmitted', array('submissionId' => $paper->getId(), 'authorName' => $user->getFullName()));
 
 		return $this->paperId;

diff --git a/classes/author/form/submit/AuthorSubmitSuppFileForm.inc.php b/classes/author/form/submit/AuthorSubmitSuppFileForm.inc.php
@@ -14,7 +14,7 @@
 
 //$Id$
 
-import('form.Form');
+import('lib.pkp.classes.form.Form');
 
 class AuthorSubmitSuppFileForm extends Form {
 	/** @var int the ID of the paper */
@@ -152,7 +152,7 @@ function readInputData() {
 	 * @return int the supplementary file ID
 	 */
 	function execute() {
-		import("file.PaperFileManager");
+		import('classes.file.PaperFileManager');
 		$paperFileManager = new PaperFileManager($this->paperId);
 		$suppFileDao =& DAORegistry::getDAO('SuppFileDAO');
 

diff --git a/classes/comment/CommentDAO.inc.php b/classes/comment/CommentDAO.inc.php
@@ -15,7 +15,7 @@
 
 //$Id$
 
-import('comment.Comment');
+import('classes.comment.Comment');
 
 define ('PAPER_COMMENT_RECURSE_ALL', -1);
 

diff --git a/classes/comment/form/CommentForm.inc.php b/classes/comment/form/CommentForm.inc.php
@@ -20,7 +20,7 @@
 // $Id$
 
 
-import('form.Form');
+import('lib.pkp.classes.form.Form');
 
 class CommentForm extends Form {
 
@@ -53,7 +53,7 @@ function CommentForm($commentId, $paperId, $galleyId, $parentId = null) {
 		$commentDao =& DAORegistry::getDAO('CommentDAO');
 		$this->comment =& $commentDao->getComment($commentId, $paperId);
 
-		import('captcha.CaptchaManager');
+		import('lib.pkp.classes.captcha.CaptchaManager');
 		$captchaManager = new CaptchaManager();
 		$this->captchaEnabled = ($captchaManager->isEnabled() && Config::getVar('captcha', 'captcha_on_comments'))?true:false;
 
@@ -117,7 +117,7 @@ function display() {
 		}
 
 		if ($this->captchaEnabled) {
-			import('captcha.CaptchaManager');
+			import('lib.pkp.classes.captcha.CaptchaManager');
 			$captchaManager = new CaptchaManager();
 			$captcha =& $captchaManager->createCaptcha();
 			if ($captcha) {

diff --git a/classes/conference/ConferenceDAO.inc.php b/classes/conference/ConferenceDAO.inc.php
@@ -15,7 +15,7 @@
 
 //$Id$
 
-import ('conference.Conference');
+import ('classes.conference.Conference');
 
 class ConferenceDAO extends DAO {
 	/**

diff --git a/classes/conference/ConferenceSettingsDAO.inc.php b/classes/conference/ConferenceSettingsDAO.inc.php
@@ -15,7 +15,7 @@
 
 //$Id$
 
-import('db.SettingsDAO');
+import('classes.db.SettingsDAO');
 class ConferenceSettingsDAO extends SettingsDAO {
 	function &_getCache($conferenceId) {
 		static $settingCache;

diff --git a/classes/conference/TrackDAO.inc.php b/classes/conference/TrackDAO.inc.php
@@ -17,7 +17,7 @@
 // $Id$
 
 
-import ('conference.Track');
+import ('classes.conference.Track');
 
 class TrackDAO extends DAO {
 	/**

diff --git a/classes/conference/log/ConferenceEventLogDAO.inc.php b/classes/conference/log/ConferenceEventLogDAO.inc.php
@@ -19,7 +19,7 @@
 
 //$Id$
 
-import ('conference.log.ConferenceEventLogEntry');
+import ('classes.conference.log.ConferenceEventLogEntry');
 
 class ConferenceEventLogDAO extends DAO {
 

diff --git a/classes/conference/log/ConferenceEventLogEntry.inc.php b/classes/conference/log/ConferenceEventLogEntry.inc.php
@@ -15,7 +15,7 @@
 
 //$Id$
 
-import('log.EventLogConstants');
+import('classes.log.EventLogConstants');
 
 // Log entry event types. All types must be defined here
 define('CONFERENCE_LOG_DEFAULT', 0);