Skip to content

Commit

Permalink
Merge pull request #586 from protich/feature/copyright
Browse files Browse the repository at this point in the history
Use the company name on the copyright notice.

Reviewed-By: Jared Hancock <jared@osticket.com>
  • Loading branch information
greezybacon committed Feb 25, 2014
2 parents 6d87b96 + 378ded5 commit b6df489
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
14 changes: 11 additions & 3 deletions include/class.company.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,20 @@ function getVar($name) {
}
}

function asVar() {
function getInfo() {
return $this->getForm()->getClean();
}

function getName() {
return $this->getVar('name');
}

function getInfo() {
return $this->getForm()->getClean();
function asVar() {
return $this->getName();
}

function __toString() {
return $this->getName();
}

/**
Expand Down
8 changes: 4 additions & 4 deletions include/client/footer.inc.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
</div>
</div>
<div id="footer">
<p>Copyright &copy; <?php echo date('Y'); ?> <a href="http://osticket.com" target="_blank" title="osTicket">osTicket.com</a> - All rights reserved.</p>
<a id="poweredBy" href="http://osticket.com" target="_blank">Powered by osTicket</a>
<p>Copyright &copy; <?php echo date('Y'); ?> <?php echo $ost->company :? 'osTicket.com'; ?> - All rights reserved.</p>
<a id="poweredBy" href="http://osticket.com" target="_blank">Helpdesk software - powered by osTicket</a>
</div>
<div id="overlay"></div>
<div id="loading">
<h4>Please Wait!</h4>
<p>Please wait... it will take a second!</p>
</div>
</div>
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion include/staff/footer.inc.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
</div>
<div id="footer">
Copyright &copy; 2006-<?php echo date('Y'); ?>&nbsp;osTicket.com. &nbsp;All Rights Reserved.
Copyright &copy; 2006-<?php echo date('Y'); ?>&nbsp;<?php echo $ost->company ?: 'osTicket.com'; ?>&nbsp;All Rights Reserved.
</div>
<?php
if(is_object($thisstaff) && $thisstaff->isStaff()) { ?>
Expand Down

0 comments on commit b6df489

Please sign in to comment.