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

…atements
pkp · May 3, 2010 · f090321 · f090321
1 parent 4cb74ab
commit f090321
Show file tree

Hide file tree

Showing 343 changed files with 1,066 additions and 1,066 deletions.
diff --git a/classes/admin/form/JournalSiteSettingsForm.inc.php b/classes/admin/form/JournalSiteSettingsForm.inc.php
@@ -15,8 +15,8 @@
 // $Id$
 
 
-import('db.DBDataXMLParser');
-import('form.Form');
+import('lib.pkp.classes.db.DBDataXMLParser');
+import('lib.pkp.classes.form.Form');
 
 class JournalSiteSettingsForm extends Form {
 
@@ -144,7 +144,7 @@ function execute() {
 			}
 
 			// Make the file directories for the journal
-			import('file.FileManager');
+			import('lib.pkp.classes.file.FileManager');
 			FileManager::mkdir(Config::getVar('files', 'files_dir') . '/journals/' . $journalId);
 			FileManager::mkdir(Config::getVar('files', 'files_dir'). '/journals/' . $journalId . '/articles');
 			FileManager::mkdir(Config::getVar('files', 'files_dir'). '/journals/' . $journalId . '/issues');
@@ -162,7 +162,7 @@ function execute() {
 			));
 
 			// Install the default RT versions.
-			import('rt.ojs.JournalRTAdmin');
+			import('classes.rt.ojs.JournalRTAdmin');
 			$journalRtAdmin = new JournalRTAdmin($journalId);
 			$journalRtAdmin->restoreVersions(false);
 

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
@@ -20,7 +20,7 @@
 
 // $Id$
 
-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/article/Article.inc.php b/classes/article/Article.inc.php
@@ -43,7 +43,7 @@
 define ('COMMENTS_DISABLE', 1);
 define ('COMMENTS_ENABLE', 2);
 
-import('submission.Submission');
+import('lib.pkp.classes.submission.Submission');
 
 class Article extends Submission {
 	/**

diff --git a/classes/article/ArticleCommentDAO.inc.php b/classes/article/ArticleCommentDAO.inc.php
@@ -16,7 +16,7 @@
 // $Id$
 
 
-import('article.ArticleComment');
+import('classes.article.ArticleComment');
 
 class ArticleCommentDAO extends DAO {
 	/**

diff --git a/classes/article/ArticleDAO.inc.php b/classes/article/ArticleDAO.inc.php
@@ -16,7 +16,7 @@
 // $Id$
 
 
-import('article.Article');
+import('classes.article.Article');
 
 class ArticleDAO extends DAO {
 	var $authorDao;
@@ -363,7 +363,7 @@ function deleteArticleById($articleId) {
 		$suppFileDao->deleteSuppFilesByArticle($articleId);
 
 		// Delete article files -- first from the filesystem, then from the database
-		import('file.ArticleFileManager');
+		import('classes.file.ArticleFileManager');
 		$articleFileDao =& DAORegistry::getDAO('ArticleFileDAO');
 		$articleFiles =& $articleFileDao->getArticleFilesByArticle($articleId);
 

diff --git a/classes/article/ArticleFileDAO.inc.php b/classes/article/ArticleFileDAO.inc.php
@@ -16,7 +16,7 @@
 // $Id$
 
 
-import('article.ArticleFile');
+import('classes.article.ArticleFile');
 
 define('INLINEABLE_TYPES_FILE', Config::getVar('general', 'registry_dir') . DIRECTORY_SEPARATOR . 'inlineTypes.txt');
 
@@ -208,7 +208,7 @@ function &getArticleFilesByArticle($articleId) {
 	 * @return array ArticleFiles
 	 */
 	function &getArticleFilesByAssocId($assocId, $type) {
-		import('file.ArticleFileManager');
+		import('classes.file.ArticleFileManager');
 		$articleFiles = array();
 
 		$result =& $this->retrieve(

diff --git a/classes/article/ArticleGalley.inc.php b/classes/article/ArticleGalley.inc.php
@@ -16,7 +16,7 @@
 // $Id$
 
 
-import('article.ArticleFile');
+import('classes.article.ArticleFile');
 
 class ArticleGalley extends ArticleFile {
 

diff --git a/classes/article/ArticleGalleyDAO.inc.php b/classes/article/ArticleGalleyDAO.inc.php
@@ -16,8 +16,8 @@
 // $Id$
 
 
-import('article.ArticleGalley');
-import('article.ArticleHTMLGalley');
+import('classes.article.ArticleGalley');
+import('classes.article.ArticleHTMLGalley');
 
 class ArticleGalleyDAO extends DAO {
 	/** Helper file DAOs. */

diff --git a/classes/article/ArticleHTMLGalley.inc.php b/classes/article/ArticleHTMLGalley.inc.php
@@ -15,7 +15,7 @@
 // $Id$
 
 
-import('article.ArticleGalley');
+import('classes.article.ArticleGalley');
 
 class ArticleHTMLGalley extends ArticleGalley {
 
@@ -41,7 +41,7 @@ function isHTMLGalley() {
 	 * @return string
 	 */
 	function getHTMLContents() {
-		import('file.ArticleFileManager');
+		import('classes.file.ArticleFileManager');
 		$fileManager = new ArticleFileManager($this->getArticleId());
 		$contents = $fileManager->readFile($this->getFileId());
 		$journal =& Request::getJournal();
@@ -171,14 +171,14 @@ function _handleOjsUrl($matchArray) {
 				break;
 			case 'sitepublic':
 					array_shift($urlParts);
-					import ('file.PublicFileManager');
+					import ('classes.file.PublicFileManager');
 					$publicFileManager = new PublicFileManager();
 					$url = Request::getBaseUrl() . '/' . $publicFileManager->getSiteFilesPath() . '/' . implode('/', $urlParts) . ($anchor?'#' . $anchor:'');
 				break;
 			case 'public':
 					array_shift($urlParts);
 					$journal =& Request::getJournal();
-					import ('file.PublicFileManager');
+					import ('classes.file.PublicFileManager');
 					$publicFileManager = new PublicFileManager();
 					$url = Request::getBaseUrl() . '/' . $publicFileManager->getJournalFilesPath($journal->getId()) . '/' . implode('/', $urlParts) . ($anchor?'#' . $anchor:'');
 				break;

diff --git a/classes/article/ArticleNote.inc.php b/classes/article/ArticleNote.inc.php
@@ -16,7 +16,7 @@
 // $Id$
 
 
-import('article.ArticleFile');
+import('classes.article.ArticleFile');
 
 class ArticleNote extends ArticleFile {
 

diff --git a/classes/article/ArticleNoteDAO.inc.php b/classes/article/ArticleNoteDAO.inc.php
@@ -16,7 +16,7 @@
 // $Id$
 
 
-import('article.ArticleNote');
+import('classes.article.ArticleNote');
 
 class ArticleNoteDAO extends DAO {
 	/**

diff --git a/classes/article/Author.inc.php b/classes/article/Author.inc.php
@@ -16,7 +16,7 @@
 // $Id$
 
 
-import('submission.PKPAuthor');
+import('lib.pkp.classes.submission.PKPAuthor');
 
 class Author extends PKPAuthor {
 

diff --git a/classes/article/AuthorDAO.inc.php b/classes/article/AuthorDAO.inc.php
@@ -16,8 +16,8 @@
 // $Id$
 
 
-import('article.Author');
-import('article.Article');
+import('classes.article.Author');
+import('classes.article.Article');
 
 class AuthorDAO extends DAO {
 	/**

diff --git a/classes/article/PublishedArticle.inc.php b/classes/article/PublishedArticle.inc.php
@@ -16,7 +16,7 @@
 // $Id$
 
 
-import('article.Article');
+import('classes.article.Article');
 
 // Access status
 define('ARTICLE_ACCESS_ISSUE_DEFAULT', 0);

diff --git a/classes/article/PublishedArticleDAO.inc.php b/classes/article/PublishedArticleDAO.inc.php
@@ -16,7 +16,7 @@
 // $Id$
 
 
-import('article.PublishedArticle');
+import('classes.article.PublishedArticle');
 
 class PublishedArticleDAO extends DAO {
 	var $articleDao;

diff --git a/classes/article/SuppFile.inc.php b/classes/article/SuppFile.inc.php
@@ -16,7 +16,7 @@
 // $Id$
 
 
-import('article.ArticleFile');
+import('classes.article.ArticleFile');
 
 class SuppFile extends ArticleFile {
 

diff --git a/classes/article/SuppFileDAO.inc.php b/classes/article/SuppFileDAO.inc.php
@@ -16,7 +16,7 @@
 // $Id$
 
 
-import('article.SuppFile');
+import('classes.article.SuppFile');
 
 class SuppFileDAO extends DAO {
 	/**

diff --git a/classes/article/log/ArticleEmailLogDAO.inc.php b/classes/article/log/ArticleEmailLogDAO.inc.php
@@ -16,7 +16,7 @@
 // $Id$
 
 
-import ('article.log.ArticleEmailLogEntry');
+import ('classes.article.log.ArticleEmailLogEntry');
 
 class ArticleEmailLogDAO extends DAO {
 	/**

diff --git a/classes/article/log/ArticleEventLogDAO.inc.php b/classes/article/log/ArticleEventLogDAO.inc.php
@@ -16,7 +16,7 @@
 // $Id$
 
 
-import ('article.log.ArticleEventLogEntry');
+import ('classes.article.log.ArticleEventLogEntry');
 
 class ArticleEventLogDAO extends DAO {
 	/**

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

diff --git a/classes/author/form/submit/AuthorSubmitStep1Form.inc.php b/classes/author/form/submit/AuthorSubmitStep1Form.inc.php
@@ -15,7 +15,7 @@
 // $Id$
 
 
-import("author.form.submit.AuthorSubmitForm");
+import('classes.author.form.submit.AuthorSubmitForm');
 
 class AuthorSubmitStep1Form extends AuthorSubmitForm {
 
@@ -51,7 +51,7 @@ function display() {
 		$isEditor = $roleDao->roleExists($journal->getId(), $user->getId(), ROLE_ID_EDITOR) || $roleDao->roleExists($journal->getId(), $user->getId(), ROLE_ID_SECTION_EDITOR);
 
 		// Set up required Payment Related Information
-		import('payment.ojs.OJSPaymentManager');
+		import('classes.payment.ojs.OJSPaymentManager');
 		$paymentManager =& OJSPaymentManager::getManager();
 		if ( $paymentManager->submissionEnabled() || $paymentManager->fastTrackEnabled() || $paymentManager->publicationEnabled()) {
 			$templateMgr->assign('authorFees', true);

diff --git a/classes/author/form/submit/AuthorSubmitStep2Form.inc.php b/classes/author/form/submit/AuthorSubmitStep2Form.inc.php
@@ -15,7 +15,7 @@
 // $Id$
 
 
-import("author.form.submit.AuthorSubmitForm");
+import('classes.author.form.submit.AuthorSubmitForm');
 
 class AuthorSubmitStep2Form extends AuthorSubmitForm {
 
@@ -69,7 +69,7 @@ function display() {
 	 * @return boolean
 	 */
 	function uploadSubmissionFile($fileName) {
-		import("file.ArticleFileManager");
+		import('classes.file.ArticleFileManager');
 
 		$articleFileManager = new ArticleFileManager($this->articleId);
 		$articleDao =& DAORegistry::getDAO('ArticleDAO');

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

diff --git a/classes/author/form/submit/AuthorSubmitStep4Form.inc.php b/classes/author/form/submit/AuthorSubmitStep4Form.inc.php
@@ -15,7 +15,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
@@ -15,7 +15,7 @@
 // $Id$
 
 
-import("author.form.submit.AuthorSubmitForm");
+import('classes.author.form.submit.AuthorSubmitForm');
 
 class AuthorSubmitStep5Form extends AuthorSubmitForm {
 
@@ -52,7 +52,7 @@ function display() {
 		$templateMgr->assign_by_ref('journal', Request::getJournal());
 
 		// Set up required Payment Related Information
-		import('payment.ojs.OJSPaymentManager');
+		import('classes.payment.ojs.OJSPaymentManager');
 		$paymentManager =& OJSPaymentManager::getManager();
 		if ( $paymentManager->submissionEnabled() || $paymentManager->fastTrackEnabled() || $paymentManager->publicationEnabled()) {
 			$templateMgr->assign('authorFees', true);
@@ -94,7 +94,7 @@ function readInputData() {
 	 * Validate the form
 	 */
 	function validate() {
-		import('payment.ojs.OJSPaymentManager');
+		import('classes.payment.ojs.OJSPaymentManager');
 		$paymentManager =& OJSPaymentManager::getManager();
 		if ( $paymentManager->submissionEnabled() ) {
 			if ( !parent::validate() ) return false;
@@ -180,12 +180,12 @@ function execute() {
 		$user =& Request::getUser();
 
 		// Update search index
-		import('search.ArticleSearchIndex');
+		import('classes.search.ArticleSearchIndex');
 		ArticleSearchIndex::indexArticleMetadata($article);
 		ArticleSearchIndex::indexArticleFiles($article);
 
 		// Send author notification email
-		import('mail.ArticleMailTemplate');
+		import('classes.mail.ArticleMailTemplate');
 		$mail = new ArticleMailTemplate($article, 'SUBMISSION_ACK', null, null, null, false);
 		$mail->setFrom($journal->getSetting('contactEmail'), $journal->getSetting('contactName'));
 		if ($mail->isEnabled()) {
@@ -218,8 +218,8 @@ function execute() {
 			$mail->send();
 		}
 
-		import('article.log.ArticleLog');
-		import('article.log.ArticleEventLogEntry');
+		import('classes.article.log.ArticleLog');
+		import('classes.article.log.ArticleEventLogEntry');
 		ArticleLog::logEvent($this->articleId, ARTICLE_LOG_ARTICLE_SUBMIT, ARTICLE_LOG_TYPE_AUTHOR, $user->getId(), 'log.author.submitted', array('submissionId' => $article->getId(), 'authorName' => $user->getFullName()));
 
 		return $this->articleId;