Skip to content
This repository has been archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
#1 Install Wizard - check application url of slash at end
Browse files Browse the repository at this point in the history
#3 database field length for image is too short
#5 Key Length explanations during setup
  • Loading branch information
lightszentip committed Mar 7, 2015
1 parent 3a8c67e commit 2ba222a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
5 changes: 4 additions & 1 deletion app/setup/appconfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function IsNullOrEmptyString($variable) {
$error = true;
$isErrorEmailAddress = true;
}
if (!filter_var($domainUrl, FILTER_VALIDATE_URL) || ($domainUrl === "" || substr($domainUrl, -strlen("/")) === $domainUrl) || IsNullOrEmptyString($domainUrl)) {
if (!filter_var($domainUrl, FILTER_VALIDATE_URL) || $domainUrl === "" || IsNullOrEmptyString($domainUrl)) {
$error = true;
$isErrorDomainUrl = true;
}
Expand All @@ -38,6 +38,9 @@ function IsNullOrEmptyString($variable) {
$error = true;
$isErrorAppAbbreviation = true;
}
if (substr($domainUrl,-1) != "/") {
$domainUrl = $domainUrl."/";
}
if (!$error) {
// save settings in database config file
// load template
Expand Down
4 changes: 2 additions & 2 deletions app/setup/config/import.sql
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ CREATE TABLE IF NOT EXISTS `%%prefix%%presententries` (
`id` BIGINT NOT NULL AUTO_INCREMENT,
`title` varchar(50) NOT NULL,
`status` varchar(25) NOT NULL,
`imagepath` varchar(50) NULL,
`imagepath` varchar(500) NULL,
`description` varchar(1200) NOT NULL,
`code` varchar(255) NULL UNIQUE,
`links` varchar(500) NULL,
Expand All @@ -30,4 +30,4 @@ INSERT INTO `%%prefix%%present_config` (`key`, `value`) VALUES ('conf_maintenanc
INSERT INTO `%%prefix%%present_config` (`key`, `value`) VALUES ('conf_template', 'style');
INSERT INTO `%%prefix%%present_config` (`key`, `value`) VALUES ('conf_version', '%%version%%');
INSERT INTO `%%prefix%%present_config` (`key`, `value`) VALUES ('conf_app_abbreviation', '%%appname%%');
INSERT INTO `%%prefix%%present_config` (`key`, `value`) VALUES ('conf_app_name', '%%appabbreviation%%');
INSERT INTO `%%prefix%%present_config` (`key`, `value`) VALUES ('conf_app_name', '%%appabbreviation%%');
8 changes: 4 additions & 4 deletions app/setup/templates/appconfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,16 @@
<label class="col-sm-2 control-label">Length for code</label>
<div class="col-sm-2">
<input class="form-control" type="number" name="codelength" value="<?php echo $codeLength; ?>">

</div>
<span class="help-block">(The Length of the code to release a present)</span>
<span class="help-block">(Length of the keys to the release of a gift (Key has a certain length and is again added to the length specified here))</span>
</div>
<hr>
<?php } ?>
<?php if ($goToNextStep) { ?>

<input type="hidden" name="nextStep" value="database">

<a href="index.php" class="btn btn-danger">
<img src="css/blueprint/plugins/buttons/icons/cross.png" alt=""/> Cancel
</a>
Expand All @@ -77,4 +77,4 @@
<img src="css/blueprint/plugins/buttons/icons/tick.png" alt=""/> Retry
</button>
<?php } ?>
</form>
</form>

0 comments on commit 2ba222a

Please sign in to comment.