Commit f0903218 authored by jerico.dev's avatar jerico.dev
Browse files

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

parent 4cb74ab8
......@@ -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 @@ class JournalSiteSettingsForm extends Form {
}
// 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 @@ class JournalSiteSettingsForm extends Form {
));
// Install the default RT versions.
import('rt.ojs.JournalRTAdmin');
import('classes.rt.ojs.JournalRTAdmin');
$journalRtAdmin = new JournalRTAdmin($journalId);
$journalRtAdmin->restoreVersions(false);
......
......@@ -16,7 +16,7 @@
// $Id$
import('admin.form.PKPSiteSettingsForm');
import('lib.pkp.classes.admin.form.PKPSiteSettingsForm');
class SiteSettingsForm extends PKPSiteSettingsForm {
......
......@@ -20,7 +20,7 @@
// $Id$
import('announcement.PKPAnnouncement');
import('lib.pkp.classes.announcement.PKPAnnouncement');
class Announcement extends PKPAnnouncement {
......
......@@ -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 {
......
......@@ -15,7 +15,7 @@
// $Id$
import('announcement.PKPAnnouncementType');
import('lib.pkp.classes.announcement.PKPAnnouncementType');
class AnnouncementType extends PKPAnnouncementType {
......
......@@ -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 {
......
......@@ -43,7 +43,7 @@ define ('COMMENTS_SECTION_DEFAULT', 0);
define ('COMMENTS_DISABLE', 1);
define ('COMMENTS_ENABLE', 2);
import('submission.Submission');
import('lib.pkp.classes.submission.Submission');
class Article extends Submission {
/**
......
......@@ -16,7 +16,7 @@
// $Id$
import('article.ArticleComment');
import('classes.article.ArticleComment');
class ArticleCommentDAO extends DAO {
/**
......
......@@ -16,7 +16,7 @@
// $Id$
import('article.Article');
import('classes.article.Article');
class ArticleDAO extends DAO {
var $authorDao;
......@@ -363,7 +363,7 @@ class ArticleDAO extends DAO {
$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);
......
......@@ -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 @@ class ArticleFileDAO extends DAO {
* @return array ArticleFiles
*/
function &getArticleFilesByAssocId($assocId, $type) {
import('file.ArticleFileManager');
import('classes.file.ArticleFileManager');
$articleFiles = array();
$result =& $this->retrieve(
......
......@@ -16,7 +16,7 @@
// $Id$
import('article.ArticleFile');
import('classes.article.ArticleFile');
class ArticleGalley extends ArticleFile {
......
......@@ -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. */
......
......@@ -15,7 +15,7 @@
// $Id$
import('article.ArticleGalley');
import('classes.article.ArticleGalley');
class ArticleHTMLGalley extends ArticleGalley {
......@@ -41,7 +41,7 @@ class ArticleHTMLGalley extends ArticleGalley {
* @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 @@ class ArticleHTMLGalley extends ArticleGalley {
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;
......
......@@ -16,7 +16,7 @@
// $Id$
import('article.ArticleFile');
import('classes.article.ArticleFile');
class ArticleNote extends ArticleFile {
......
......@@ -16,7 +16,7 @@
// $Id$
import('article.ArticleNote');
import('classes.article.ArticleNote');
class ArticleNoteDAO extends DAO {
/**
......
......@@ -16,7 +16,7 @@
// $Id$
import('submission.PKPAuthor');
import('lib.pkp.classes.submission.PKPAuthor');
class Author extends PKPAuthor {
......
......@@ -16,8 +16,8 @@
// $Id$
import('article.Author');
import('article.Article');
import('classes.article.Author');
import('classes.article.Article');
class AuthorDAO extends DAO {
/**
......
......@@ -16,7 +16,7 @@
// $Id$
import('article.Article');
import('classes.article.Article');
// Access status
define('ARTICLE_ACCESS_ISSUE_DEFAULT', 0);
......
......@@ -16,7 +16,7 @@
// $Id$
import('article.PublishedArticle');
import('classes.article.PublishedArticle');
class PublishedArticleDAO extends DAO {
var $articleDao;
......
......@@ -16,7 +16,7 @@
// $Id$
import('article.ArticleFile');
import('classes.article.ArticleFile');
class SuppFile extends ArticleFile {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment