Skip to content

Commit afe79ce

Browse files
committed
Fix setup page
1 parent 0a9cc08 commit afe79ce

File tree

7 files changed

+32
-9
lines changed

7 files changed

+32
-9
lines changed

admin/setup_automation.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@
118118
}
119119
$arrayofsuffixfound[$tmpservice] = $suffix;
120120
}
121+
if (empty($arrayofsuffixfound)) {
122+
$arrayofsuffixfound[] = '';
123+
}
121124

122125

123126
/*

admin/setup_deploy_dolibarr.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,13 @@
121121
}
122122
$arrayofsuffixfound[$tmpservice] = $suffix;
123123
}
124+
if (empty($arrayofsuffixfound)) {
125+
$arrayofsuffixfound[] = '';
126+
}
124127
// $arrayofsuffixfound should be now array('mysaasdomain'=>'', mysaasdomainalt'=>'_MYSAASDOMAINALT_COM', ...)
125128
//var_dump($arrayofsuffixfound);
126129

127130

128-
129131
/*
130132
* Actions
131133
*/

admin/setup_deploy_server.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@
116116
}
117117
$arrayofsuffixfound[$tmpservice] = $suffix;
118118
}
119+
if (empty($arrayofsuffixfound)) {
120+
$arrayofsuffixfound[] = '';
121+
}
119122

120123

121124
/*

admin/setup_endpoints.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@
116116
}
117117
$arrayofsuffixfound[$tmpservice] = $suffix;
118118
}
119+
if (empty($arrayofsuffixfound)) {
120+
$arrayofsuffixfound[] = '';
121+
}
119122

120123

121124
/*

admin/setup_other.php

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,9 @@
122122
}
123123
$arrayofsuffixfound[$tmpservice] = $suffix;
124124
}
125+
if (empty($arrayofsuffixfound)) {
126+
$arrayofsuffixfound[] = '';
127+
}
125128
// $arrayofsuffixfound should be now array('mysaasdomain'=>'', mysaasdomainalt'=>'_MYSAASDOMAINALT_COM', ...)
126129
//var_dump($arrayofsuffixfound);
127130

@@ -312,7 +315,8 @@
312315
print '<table class="noborder centpercent">';
313316
print '<tr class="liste_titre">';
314317
print '<td class="titlefieldmiddle">'.$langs->trans("Parameters").'</td><td></td>';
315-
print '<td><div class="float">'.$langs->trans("Examples").'</div><div class="floatright"><input type="submit" class="button buttongen" value="'.$langs->trans("Save").'"></div></td>';
318+
print '<td><div class="float">'.$langs->trans("Examples").'</div><div class="floatright">';
319+
print '</div></td>';
316320
print "</tr>\n";
317321

318322
print '<tr class="oddeven"><td>'.$langs->trans("SellYourSaasStatusUrl").'</td>';
@@ -371,13 +375,13 @@
371375
print '<tr class="oddeven"><td><label for="logo">'.$service.' - '.$langs->trans("LogoWhiteBackground").' (png,jpg)</label></td><td>';
372376
print '<table width="100%" class="nobordernopadding"><tr class="nocellnopadd"><td valign="middle" class="nocellnopadd">';
373377
print '<input type="file" class="flat class=minwidth200" name="logo'.$suffix.'" id="logo'.$suffix.'">';
374-
print '</td><td class="nocellnopadd" valign="middle">';
378+
print '</td><td class="nocellnopadd valignmiddle">';
375379
$constname = 'SELLYOURSAAS_LOGO_MINI'.$suffix;
376380
print '<!-- constname = '.$constname.' -->';
377381
if (getDolGlobalString($constname)) {
378382
print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogo&suffix='.urlencode($suffix).'">'.img_delete($langs->trans("Delete")).'</a>';
379383
if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/' . getDolGlobalString($constname))) {
380-
print ' &nbsp; ';
384+
print '</td></td>';
381385
print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/' . getDolGlobalString($constname)).'">';
382386
}
383387
} else {
@@ -391,12 +395,12 @@
391395
print '<tr class="oddeven"><td><label for="logo">'.$service.' - '.$langs->trans("LogoBlackBackground").' (png,jpg)</label></td><td>';
392396
print '<table width="100%" class="nobordernopadding"><tr class="nocellnopadd"><td valign="middle" class="nocellnopadd">';
393397
print '<input type="file" class="flat class=minwidth200" name="logoblack'.$suffix.'" id="logoblack'.$suffix.'">';
394-
print '</td><td class="nocellnopadd" valign="middle">';
398+
print '</td><td class="nocellnopadd valignmiddle">';
395399
$constname = 'SELLYOURSAAS_LOGO_MINI_BLACK'.$suffix;
396400
if (getDolGlobalString($constname)) {
397401
print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogoblack&suffix='.urlencode($suffix).'">'.img_delete($langs->trans("Delete")).'</a>';
398402
if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/' . getDolGlobalString($constname))) {
399-
print ' &nbsp; ';
403+
print '</td></td>';
400404
print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/' . getDolGlobalString($constname)).'">';
401405
}
402406
} else {
@@ -521,7 +525,8 @@
521525

522526
print '<tr class="liste_titre">';
523527
print '<td>'.$langs->trans("SupportFeatures").'</td><td></td>';
524-
print '<td></td>';
528+
print '<td>';
529+
print '</td>';
525530
print "</tr>\n";
526531

527532
foreach ($arrayofsuffixfound as $service => $suffix) {
@@ -559,8 +564,7 @@
559564
print '</table>';
560565
print '</div>';
561566

562-
print '</table>';
563-
print '</div>';
567+
print '<center><input type="submit" class="button buttongen" value="'.$langs->trans("Save").'"></center>';
564568

565569
print "</form>\n";
566570

admin/setup_register_security.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,11 @@
116116
}
117117
$arrayofsuffixfound[$tmpservice] = $suffix;
118118
}
119+
if (empty($arrayofsuffixfound)) {
120+
$arrayofsuffixfound[] = '';
121+
}
122+
// $arrayofsuffixfound should be now array('mysaasdomain'=>'', mysaasdomainalt'=>'_MYSAASDOMAINALT_COM', ...)
123+
//var_dump($arrayofsuffixfound);
119124

120125

121126
/*

admin/setup_reseller.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@
116116
}
117117
$arrayofsuffixfound[$tmpservice] = $suffix;
118118
}
119+
if (empty($arrayofsuffixfound)) {
120+
$arrayofsuffixfound[] = '';
121+
}
119122

120123

121124
/*

0 commit comments

Comments
 (0)