deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed constants

Browse source
This commit is contained in:
Dmitry Khomutov 2016-07-21 21:20:34 +06:00
commit 4fee89fb80
46 changed files with 204 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/PHPCensor/Controller/BuildController.php
View file

@ -88,10 +88,10 @@ class BuildController extends Controller
}
$rebuild = Lang::get('rebuild_now');
$rebuildLink = PHPCI_URL . 'build/rebuild/' . $build->getId();
$rebuildLink = APP_URL . 'build/rebuild/' . $build->getId();
$delete = Lang::get('delete_build');
$deleteLink = PHPCI_URL . 'build/delete/' . $build->getId();
$deleteLink = APP_URL . 'build/delete/' . $build->getId();
$actions = "<a class=\"btn btn-default\" href=\"{$rebuildLink}\">{$rebuild}</a> ";
@ -109,7 +109,7 @@ class BuildController extends Controller
protected function getUiPlugins()
{
$rtn = [];
$path = PHPCI_PUBLIC_DIR . 'assets' . DIRECTORY_SEPARATOR . 'js' . DIRECTORY_SEPARATOR . 'build-plugins' . DIRECTORY_SEPARATOR;
$path = PUBLIC_DIR . 'assets' . DIRECTORY_SEPARATOR . 'js' . DIRECTORY_SEPARATOR . 'build-plugins' . DIRECTORY_SEPARATOR;
$dir = opendir($path);
while ($item = readdir($dir)) {
@ -206,7 +206,7 @@ class BuildController extends Controller
}
$response = new b8\Http\Response\RedirectResponse();
$response->setHeader('Location', PHPCI_URL.'build/view/' . $build->getId());
$response->setHeader('Location', APP_URL.'build/view/' . $build->getId());
return $response;
}
@ -226,7 +226,7 @@ class BuildController extends Controller
$this->buildService->deleteBuild($build);
$response = new b8\Http\Response\RedirectResponse();
$response->setHeader('Location', PHPCI_URL.'project/view/' . $build->getProjectId());
$response->setHeader('Location', APP_URL.'project/view/' . $build->getProjectId());
return $response;
}

6
src/PHPCensor/Controller/GroupController.php
View file

@ -80,13 +80,13 @@ class GroupController extends Controller
$this->groupStore->save($group);
$response = new b8\Http\Response\RedirectResponse();
$response->setHeader('Location', PHPCI_URL.'group');
$response->setHeader('Location', APP_URL.'group');
return $response;
}
$form = new Form();
$form->setMethod('POST');
$form->setAction(PHPCI_URL . 'group/edit' . (!is_null($groupId) ? '/' . $groupId : ''));
$form->setAction(APP_URL . 'group/edit' . (!is_null($groupId) ? '/' . $groupId : ''));
$title = new Form\Element\Text('title');
$title->setContainerClass('form-group');
@ -115,7 +115,7 @@ class GroupController extends Controller
$this->groupStore->delete($group);
$response = new b8\Http\Response\RedirectResponse();
$response->setHeader('Location', PHPCI_URL.'group');
$response->setHeader('Location', APP_URL.'group');
return $response;
}
}

2
src/PHPCensor/Controller/PluginController.php
View file

@ -36,7 +36,7 @@ class PluginController extends Controller
$this->view->installedPackages = $json['require'];
$pluginInfo = new PluginInformationCollection();
$pluginInfo->add(FilesPluginInformation::newFromDir(PHPCI_DIR . "Plugin" . DIRECTORY_SEPARATOR));
$pluginInfo->add(FilesPluginInformation::newFromDir(SRC_DIR . "Plugin" . DIRECTORY_SEPARATOR));
$pluginInfo->add(ComposerPluginInformation::buildFromYaml(
ROOT_DIR . "vendor" . DIRECTORY_SEPARATOR . "composer" . DIRECTORY_SEPARATOR . "installed.json"
));

12
src/PHPCensor/Controller/ProjectController.php
View file

@ -79,7 +79,7 @@ class ProjectController extends PHPCensor\Controller
if ($page > $pages) {
$response = new b8\Http\Response\RedirectResponse();
$response->setHeader('Location', PHPCI_URL.'project/view/'.$projectId);
$response->setHeader('Location', APP_URL.'project/view/'.$projectId);
return $response;
}
@ -121,7 +121,7 @@ class ProjectController extends PHPCensor\Controller
}
$response = new b8\Http\Response\RedirectResponse();
$response->setHeader('Location', PHPCI_URL.'build/view/' . $build->getId());
$response->setHeader('Location', APP_URL.'build/view/' . $build->getId());
return $response;
}
@ -136,7 +136,7 @@ class ProjectController extends PHPCensor\Controller
$this->projectService->deleteProject($project);
$response = new b8\Http\Response\RedirectResponse();
$response->setHeader('Location', PHPCI_URL);
$response->setHeader('Location', APP_URL);
return $response;
}
@ -230,7 +230,7 @@ class ProjectController extends PHPCensor\Controller
$project = $this->projectService->createProject($title, $type, $reference, $options);
$response = new b8\Http\Response\RedirectResponse();
$response->setHeader('Location', PHPCI_URL.'project/view/' . $project->getId());
$response->setHeader('Location', APP_URL.'project/view/' . $project->getId());
return $response;
}
}
@ -295,7 +295,7 @@ class ProjectController extends PHPCensor\Controller
$project = $this->projectService->updateProject($project, $title, $type, $reference, $options);
$response = new b8\Http\Response\RedirectResponse();
$response->setHeader('Location', PHPCI_URL.'project/view/' . $project->getId());
$response->setHeader('Location', APP_URL.'project/view/' . $project->getId());
return $response;
}
@ -306,7 +306,7 @@ class ProjectController extends PHPCensor\Controller
{
$form = new Form();
$form->setMethod('POST');
$form->setAction(PHPCI_URL.'project/' . $type);
$form->setAction(APP_URL.'project/' . $type);
$form->addField(new Form\Element\Csrf('csrf'));
$form->addField(new Form\Element\Hidden('pubkey'));

10
src/PHPCensor/Controller/SessionController.php
View file

@ -66,7 +66,7 @@ class SessionController extends Controller
$form = new b8\Form();
$form->setMethod('POST');
$form->setAction(PHPCI_URL.'session/login');
$form->setAction(APP_URL.'session/login');
$email = new b8\Form\Element\Email('email');
$email->setLabel(Lang::get('email_address'));
@ -110,7 +110,7 @@ class SessionController extends Controller
session_destroy();
$response = new b8\Http\Response\RedirectResponse();
$response->setHeader('Location', PHPCI_URL);
$response->setHeader('Location', APP_URL);
return $response;
}
@ -130,7 +130,7 @@ class SessionController extends Controller
}
$key = md5(date('Y-m-d') . $user->getHash());
$url = PHPCI_URL;
$url = APP_URL;
$message = Lang::get('reset_email_body', $user->getName(), $url, $user->getId(), $key);
@ -170,7 +170,7 @@ class SessionController extends Controller
$_SESSION['phpci_user_id'] = $user->getId();
$response = new b8\Http\Response\RedirectResponse();
$response->setHeader('Location', PHPCI_URL);
$response->setHeader('Location', APP_URL);
return $response;
}
@ -186,7 +186,7 @@ class SessionController extends Controller
*/
protected function getLoginRedirect()
{
$rtn = PHPCI_URL;
$rtn = APP_URL;
if (!empty($_SESSION['phpci_login_redirect'])) {
$rtn .= $_SESSION['phpci_login_redirect'];

42
src/PHPCensor/Controller/SettingsController.php
View file

@ -40,7 +40,7 @@ class SettingsController extends Controller
parent::init();
$parser = new Parser();
$yaml = file_get_contents(PHPCI_APP_DIR . 'config.yml');
$yaml = file_get_contents(APP_DIR . 'config.yml');
$this->settings = $parser->parse($yaml);
}
@ -76,7 +76,7 @@ class SettingsController extends Controller
$authSettings = $this->settings['phpci']['authentication_settings'];
}
$this->view->configFile = PHPCI_APP_DIR . 'config.yml';
$this->view->configFile = APP_DIR . 'config.yml';
$this->view->basicSettings = $this->getBasicForm($basicSettings);
$this->view->buildSettings = $this->getBuildForm($buildSettings);
$this->view->github = $this->getGithubForm();
@ -105,9 +105,9 @@ class SettingsController extends Controller
$response = new b8\Http\Response\RedirectResponse();
if ($error) {
$response->setHeader('Location', PHPCI_URL . 'settings?saved=2');
$response->setHeader('Location', APP_URL . 'settings?saved=2');
} else {
$response->setHeader('Location', PHPCI_URL . 'settings?saved=1');
$response->setHeader('Location', APP_URL . 'settings?saved=1');
}
return $response;
@ -128,9 +128,9 @@ class SettingsController extends Controller
$response = new b8\Http\Response\RedirectResponse();
if ($error) {
$response->setHeader('Location', PHPCI_URL . 'settings?saved=2');
$response->setHeader('Location', APP_URL . 'settings?saved=2');
} else {
$response->setHeader('Location', PHPCI_URL . 'settings?saved=1');
$response->setHeader('Location', APP_URL . 'settings?saved=1');
}
return $response;
@ -150,9 +150,9 @@ class SettingsController extends Controller
$response = new b8\Http\Response\RedirectResponse();
if ($error) {
$response->setHeader('Location', PHPCI_URL . 'settings?saved=2');
$response->setHeader('Location', APP_URL . 'settings?saved=2');
} else {
$response->setHeader('Location', PHPCI_URL . 'settings?saved=1');
$response->setHeader('Location', APP_URL . 'settings?saved=1');
}
return $response;
@ -171,9 +171,9 @@ class SettingsController extends Controller
$response = new b8\Http\Response\RedirectResponse();
if ($error) {
$response->setHeader('Location', PHPCI_URL . 'settings?saved=2');
$response->setHeader('Location', APP_URL . 'settings?saved=2');
} else {
$response->setHeader('Location', PHPCI_URL . 'settings?saved=1');
$response->setHeader('Location', APP_URL . 'settings?saved=1');
}
return $response;
@ -194,9 +194,9 @@ class SettingsController extends Controller
$response = new b8\Http\Response\RedirectResponse();
if ($error) {
$response->setHeader('Location', PHPCI_URL . 'settings?saved=2');
$response->setHeader('Location', APP_URL . 'settings?saved=2');
} else {
$response->setHeader('Location', PHPCI_URL . 'settings?saved=1');
$response->setHeader('Location', APP_URL . 'settings?saved=1');
}
return $response;
@ -223,13 +223,13 @@ class SettingsController extends Controller
$this->storeSettings();
$response = new b8\Http\Response\RedirectResponse();
$response->setHeader('Location', PHPCI_URL . 'settings?linked=1');
$response->setHeader('Location', APP_URL . 'settings?linked=1');
return $response;
}
}
$response = new b8\Http\Response\RedirectResponse();
$response->setHeader('Location', PHPCI_URL . 'settings?linked=2');
$response->setHeader('Location', APP_URL . 'settings?linked=2');
return $response;
}
@ -242,7 +242,7 @@ class SettingsController extends Controller
{
$dumper = new Dumper();
$yaml = $dumper->dump($this->settings, 4);
file_put_contents(PHPCI_APP_DIR . 'config.yml', $yaml);
file_put_contents(APP_DIR . 'config.yml', $yaml);
if (error_get_last()) {
$error_get_last = error_get_last();
@ -258,7 +258,7 @@ class SettingsController extends Controller
{
$form = new Form();
$form->setMethod('POST');
$form->setAction(PHPCI_URL . 'settings/github');
$form->setAction(APP_URL . 'settings/github');
$form->addField(new Form\Element\Csrf('csrf'));
$field = new Form\Element\Text('githubid');
@ -302,7 +302,7 @@ class SettingsController extends Controller
{
$form = new Form();
$form->setMethod('POST');
$form->setAction(PHPCI_URL . 'settings/email');
$form->setAction(APP_URL . 'settings/email');
$form->addField(new Form\Element\Csrf('csrf'));
$field = new Form\Element\Text('smtp_address');
@ -387,7 +387,7 @@ class SettingsController extends Controller
*/
protected function canWriteConfig()
{
return is_writeable(PHPCI_APP_DIR . 'config.yml');
return is_writeable(APP_DIR . 'config.yml');
}
/**
@ -399,7 +399,7 @@ class SettingsController extends Controller
{
$form = new Form();
$form->setMethod('POST');
$form->setAction(PHPCI_URL . 'settings/build');
$form->setAction(APP_URL . 'settings/build');
$field = new Form\Element\Select('failed_after');
$field->setRequired(false);
@ -436,7 +436,7 @@ class SettingsController extends Controller
{
$form = new Form();
$form->setMethod('POST');
$form->setAction(PHPCI_URL . 'settings/basic');
$form->setAction(APP_URL . 'settings/basic');
$field = new Form\Element\Select('language');
$field->setRequired(true);
@ -468,7 +468,7 @@ class SettingsController extends Controller
{
$form = new Form();
$form->setMethod('POST');
$form->setAction(PHPCI_URL . 'settings/authentication');
$form->setAction(APP_URL . 'settings/authentication');
$form->addField(new Form\Element\Csrf('csrf'));
$field = new Form\Element\Checkbox('disable_authentication');

10
src/PHPCensor/Controller/UserController.php
View file

@ -92,7 +92,7 @@ class UserController extends Controller
}
$form = new Form();
$form->setAction(PHPCI_URL.'user/profile');
$form->setAction(APP_URL.'user/profile');
$form->setMethod('POST');
$name = new Form\Element\Text('name');
@ -174,7 +174,7 @@ class UserController extends Controller
$this->userService->createUser($name, $email, $password, $isAdmin);
$response = new b8\Http\Response\RedirectResponse();
$response->setHeader('Location', PHPCI_URL . 'user');
$response->setHeader('Location', APP_URL . 'user');
return $response;
}
@ -215,7 +215,7 @@ class UserController extends Controller
$this->userService->updateUser($user, $name, $email, $password, $isAdmin);
$response = new b8\Http\Response\RedirectResponse();
$response->setHeader('Location', PHPCI_URL . 'user');
$response->setHeader('Location', APP_URL . 'user');
return $response;
}
@ -226,7 +226,7 @@ class UserController extends Controller
{
$form = new Form();
$form->setMethod('POST');
$form->setAction(PHPCI_URL.'user/' . $type);
$form->setAction(APP_URL.'user/' . $type);
$form->addField(new Form\Element\Csrf('csrf'));
$field = new Form\Element\Email('email');
@ -289,7 +289,7 @@ class UserController extends Controller
$this->userService->deleteUser($user);
$response = new b8\Http\Response\RedirectResponse();
$response->setHeader('Location', PHPCI_URL . 'user');
$response->setHeader('Location', APP_URL . 'user');
return $response;
}
}