Skip to content

Commit

Permalink
[public] Remove PHP short tags from installer for compatibility.
Browse files Browse the repository at this point in the history
  • Loading branch information
@brockf
brockf committed Aug 14, 2013
1 parent c238638 commit 441a9df
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 51 deletions.
20 changes: 10 additions & 10 deletions app/views/install/admin.php
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
<?=$this->load->view(branded_view('install/header'));?>
<?php echo $this->load->view(branded_view('install/header'));?>
<h1>Administrator Account</h1>
<p>Your MySQL database and configuration files have been setup.</p>
<p>We will now create the primary administrator account for your <?=$this->config->item('app_name');?> server.</p>
<p>We will now create the primary administrator account for your <?php echo $this->config->item('app_name');?> server.</p>
<form class="form" method="post" action="">
<fieldset>
<legend>Admin Information</legend>
<ol>
<li>
<label for="first_name">Name</label>
<input class="text required mark_empty" rel="First Name" type="text" id="first_name" name="first_name" value="<?=$first_name;?>" />&nbsp;&nbsp;<label style="display:none" for="last_name">Last Name</label><input class="text required mark_empty" rel="Last Name" type="text" id="last_name" name="last_name" value="<?=$last_name;?>" />
<input class="text required mark_empty" rel="First Name" type="text" id="first_name" name="first_name" value="<?php echo $first_name;?>" />&nbsp;&nbsp;<label style="display:none" for="last_name">Last Name</label><input class="text required mark_empty" rel="Last Name" type="text" id="last_name" name="last_name" value="<?php echo $last_name;?>" />
</li>
<li>
<label for="email" class="full">Email Address</label>
</li>
<li>
<input type="text" autocomplete="off" class="text required full email mark_empty" rel="[email protected]" id="email" name="email" value="<?=$email;?>" />
<input type="text" autocomplete="off" class="text required full email mark_empty" rel="[email protected]" id="email" name="email" value="<?php echo $email;?>" />
</li>
<li>
<label for="username" class="full">Username</label>
</li>
<li>
<input type="text" autocomplete="off" class="text required full mark_empty" rel="select a username" id="username" name="username" value="<?=$username;?>" />
<input type="text" autocomplete="off" class="text required full mark_empty" rel="select a username" id="username" name="username" value="<?php echo $username;?>" />
</li>
<? if (!empty($error_password)) { ?>
<?php if (!empty($error_password)) { ?>
<li>
<p class="error"><?=$error_password;?></p>
<p class="error"><?php echo $error_password;?></p>
</li>
<? } ?>
<?php } ?>
<li>
<label for="password" class="full">Password</label>
</li>
Expand All @@ -44,10 +44,10 @@
</li>
<li>
<label for="timezone">Timezone</label>
<?=timezone_menu($gmt_offset);?>
<?php echo timezone_menu($gmt_offset);?>
</li>
</ol>
</fieldset>
<div class="submit"><input type="submit" class="button" name="continue" id="continue" value="Create Account" /></div>
</form>
<?=$this->load->view(branded_view('install/footer'));?>
<?php echo $this->load->view(branded_view('install/footer'));?>
18 changes: 9 additions & 9 deletions app/views/install/complete.php
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<?=$this->load->view(branded_view('install/header'), array('complete' => TRUE));?>
<?php echo $this->load->view(branded_view('install/header'), array('complete' => TRUE));?>
<h1>Install Complete!</h1>
<p class="error"><b>Do not refresh this page! Now that <?=$this->config->item('app_name');?> is installed, the installer will be completely disabled.</b></p>
<p><strong>Congratulations! You have successfully uploaded and configured <?=$this->config->item('app_name');?>.</strong></p>
<p class="error"><b>Do not refresh this page! Now that <?php echo $this->config->item('app_name');?> is installed, the installer will be completely disabled.</b></p>
<p><strong>Congratulations! You have successfully uploaded and configured <?php echo $this->config->item('app_name');?>.</strong></p>
<p>Important instructions, credentials and links will follow.</p>
<h2>Setup your cronjobs</h2>
<p>Automated processes like emails and recurring charges require the daily execution of two cronjobs. Please use
a crontab manager (either in your cPanel/Plesk control panel or via SSH) to setup the following crontabs, exactly as so:</p>
<ul>
<li>*/5 * * * * wget -q -O /dev/null <?=site_url('cron/update/' . $cron_key);?> > /dev/null 2>&1</li>
<li>*/5 * * * * wget -q -O /dev/null <?php echo site_url('cron/update/' . $cron_key);?> > /dev/null 2>&1</li>
</ul>
<h2>Control Panel</h2>
<ul>
<li>Your control panel is accessible at: <a href="<?=$cp_link;?>"><strong><?=$cp_link;?></strong></a></li>
<li>Your control panel is accessible at: <a href="<?php echo $cp_link;?>"><strong><?php echo $cp_link;?></strong></a></li>
</ul>
<h2>Your Account Credentials</h2>
<p>You can login to the control panel, and throughout the site, with:</p>
<ul>
<li>Username: <strong><?=$username;?></strong> or <strong><?=$email;?></strong></li>
<li>Password: <strong><?=$password;?></strong></li>
<li>Username: <strong><?php echo $username;?></strong> or <strong><?php echo $email;?></strong></li>
<li>Password: <strong><?php echo $password;?></strong></li>
</ul>
<p><a href="<?=$cp_link;?>">Login to your Control Panel now to setup gateways, client accounts, emails, and more</a>.</p>
<?=$this->load->view(branded_view('install/footer'));?>
<p><a href="<?php echo $cp_link;?>">Login to your Control Panel now to setup gateways, client accounts, emails, and more</a>.</p>
<?php echo $this->load->view(branded_view('install/footer'));?>
52 changes: 26 additions & 26 deletions app/views/install/configuration.php
View file
Original file line number Diff line number Diff line change
@@ -1,71 +1,71 @@
<?=$this->load->view(branded_view('install/header'));?>
<?php echo $this->load->view(branded_view('install/header'));?>
<h1>Configuration</h1>
<p><strong>Welcome to <?=$this->config->item('app_name');?>!</strong></p>
<p><strong>Welcome to <?php echo $this->config->item('app_name');?>!</strong></p>
<p>Installation takes just a few moments.</p>
<? if (!empty($file_permission_errors)) { ?>
<? foreach ($file_permission_errors as $error) { ?>
<p class="error"><strong><?=$error['file'];?> must be writable by the web server</strong> - You must set the
<? if ($error['folder'] == TRUE) { ?>folder<? } else { ?>file<? } ?> permissions
<?php if (!empty($file_permission_errors)) { ?>
<?php foreach ($file_permission_errors as $error) { ?>
<p class="error"><strong><?php echo $error['file'];?> must be writable by the web server</strong> - You must set the
<?php if ($error['folder'] == TRUE) { ?>folder<?php } else { ?>file<?php } ?> permissions
with CHMOD (0666, 0755, or 0777) and, possibly, file ownership with a CHOWN command.</strong></p>
<? } ?>
<?php } ?>
<p><a href="">Click here to refresh after making permissions changes</a></p>
<? } else { ?>
<?php } else { ?>
<p>Before continuing, please create and take note of a MySQL database user account and empty MySQL database. Electric Publisher
will automatically create the necessary tables and data but you must ensure that your MySQL account has the proper permissions
and that this database exists.</p>
<form class="form" method="post" action="">
<fieldset>
<legend>Site Information</legend>
<? if ($error_empty_site == TRUE) { ?>
<?php if ($error_empty_site == TRUE) { ?>
<p class="error">These are required fields and must not be empty.</p>
<? } ?>
<? if ($error_base_url == TRUE) { ?>
<?php } ?>
<?php if ($error_base_url == TRUE) { ?>
<p class="error">Your Base Server URL must include "http://" (it will be rewritten as "https://" where necessary)
and be the domain path to your <?=$this->config->item('app_name');?> installation.</p>
<? } ?>
and be the domain path to your <?php echo $this->config->item('app_name');?> installation.</p>
<?php } ?>
<ol>
<li>
<label for="base_url">Base Server URL</label>
<input type="text" name="base_url" id="base_url" class="text required" value="<?=$domain;?>" />
<input type="text" name="base_url" id="base_url" class="text required" value="<?php echo $domain;?>" />
</li>
<li>
<label for="site_name">Site Name</label>
<input type="text" name="site_name" id="site_name" class="text required" value="<?=$site_name;?>" />
<input type="text" name="site_name" id="site_name" class="text required" value="<?php echo $site_name;?>" />
</li>
<li>
<label for="site_email">Site Email</label>
<input type="text" name="site_email" id="site_email" class="text required" value="<?=$site_email;?>" />
<input type="text" name="site_email" id="site_email" class="text required" value="<?php echo $site_email;?>" />
</li>
</ol>
<input type="hidden" name="cron_key" id="cron_key" class="text required" value="<?=$cron_key;?>" />
<input type="hidden" name="encryption_key" id="encryption_key" class="text required" value="<?=$encryption_key;?>" />
<input type="hidden" name="cron_key" id="cron_key" class="text required" value="<?php echo $cron_key;?>" />
<input type="hidden" name="encryption_key" id="encryption_key" class="text required" value="<?php echo $encryption_key;?>" />
</fieldset>
<fieldset>
<legend>MySQL Database</legend>
<? if ($error_mysql == TRUE) { ?>
<?php if ($error_mysql == TRUE) { ?>
<p class="error">Your MySQL connection information is invalid. Please verify your user credentials, access privileges,
and database name.</p>
<? } ?>
<?php } ?>
<ol>
<li>
<label for="db_host">Database Host</label>
<input type="text" name="db_host" id="db_host" class="text required" value="<?=$db_host;?>" />
<input type="text" name="db_host" id="db_host" class="text required" value="<?php echo $db_host;?>" />
</li>
<li>
<label for="db_user">Database Username</label>
<input type="text" name="db_user" id="db_user" class="text required mark_empty" rel="Your MySQL Database Username" value="<?=$db_user;?>" />
<input type="text" name="db_user" id="db_user" class="text required mark_empty" rel="Your MySQL Database Username" value="<?php echo $db_user;?>" />
</li>
<li>
<label for="db_pass">Database Password</label>
<input type="text" name="db_pass" id="db_pass" class="text required mark_empty" rel="Your MySQL Database Password" value="<?=$db_pass;?>" />
<input type="text" name="db_pass" id="db_pass" class="text required mark_empty" rel="Your MySQL Database Password" value="<?php echo $db_pass;?>" />
</li>
<li>
<label for="db_name">Database Name</label>
<input type="text" name="db_name" id="db_name" class="text required mark_empty" rel="The name of your empty MySQL database" value="<?=$db_name;?>" />
<input type="text" name="db_name" id="db_name" class="text required mark_empty" rel="The name of your empty MySQL database" value="<?php echo $db_name;?>" />
</li>
</ol>
</fieldset>
<div class="submit"><input type="submit" class="button" name="continue" id="continue" value="Save Configuration" /></div>
</form>
<? } ?>
<?=$this->load->view(branded_view('install/footer'));?>
<?php } ?>
<?php echo $this->load->view(branded_view('install/footer'));?>
2 changes: 1 addition & 1 deletion app/views/install/footer.php
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div id="footer">
Copyright &copy; <?=date('Y');?>, <a href="http://www.electricfunction.com">Electric Function, Inc</a>. All Rights Reserved.
Copyright &copy; <?php echo date('Y');?>, <a href="http://www.electricfunction.com">Electric Function, Inc</a>. All Rights Reserved.
</div>
</div>
</body>
Expand Down
10 changes: 5 additions & 5 deletions app/views/install/header.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><?=$this->config->item('app_name');?> Installer</title>
<title><?php echo $this->config->item('app_name');?> Installer</title>
<link href="../branding/default/css/installer.css" rel="stylesheet" type="text/css" media="screen" />
<script type="text/javascript" src="../branding/default/js/jquery-1.4.2.js"></script>
<script type="text/javascript" src="../branding/default/js/universal.js"></script>
Expand All @@ -13,15 +13,15 @@
<div id="wrapper">
<div id="header">
<div id="logo">
<?=$this->config->item('app_name');?>
<?php echo $this->config->item('app_name');?>
<span>Installation Wizard</span>
</div>

<div id="nav">
<ol>
<li<? if ($this->router->fetch_method() == 'index') { ?> class="active"<? } ?>>Configuration</li>
<li<? if ($this->router->fetch_method() == 'admin' and !isset($complete)) { ?> class="active"<? } ?>>Administrator</li>
<li<? if (isset($complete) and $complete == TRUE) { ?> class="active"<? } ?>>Install Complete</li>
<li<?php if ($this->router->fetch_method() == 'index') { ?> class="active"<?php } ?>>Configuration</li>
<li<?php if ($this->router->fetch_method() == 'admin' and !isset($complete)) { ?> class="active"<?php } ?>>Administrator</li>
<li<?php if (isset($complete) and $complete == TRUE) { ?> class="active"<?php } ?>>Install Complete</li>
</ol>
</div>
</div>
Expand Down

0 comments on commit 441a9df

Please sign in to comment.