Consistent phpdoc entries

This commit is contained in:
Deon George
2013-03-20 09:35:19 +11:00
parent 2cdd130d1a
commit f2816dd902
207 changed files with 570 additions and 743 deletions

View File

@@ -1,13 +1,13 @@
<?php defined('SYSPATH') or die('No direct access allowed.');
/**
* This class is for access system configuration.
* This class extends the core Kohana class by adding some core application
* specific functions, and configuration.
*
* @package OSB
* @subpackage Config
* @category Helpers
* @category Modifications
* @author Deon George
* @copyright (c) 2010 Open Source Billing
* @copyright (c) 2009-2013 Open Source Billing
* @license http://dev.osbill.net/license.html
*/
class Config extends Kohana_Config {
@@ -82,7 +82,7 @@ class Config extends Kohana_Config {
/**
* The URI to show for the login prompt.
* Normally if the user is logged in, we can replace it with a user edit call, instead of login
* Normally if the user is logged in, we can replace it with something else
*/
public static function login_uri() {
return ($ao = Auth::instance()->get_user() AND is_object($ao)) ? HTML::anchor(URL::link('user','account/edit'),$ao->name()) : HTML::anchor('login',_('Login'));
@@ -92,10 +92,10 @@ class Config extends Kohana_Config {
return HTML::image(static::logo_uri(),array('class'=>'headlogo','alt'=>_('Logo')));
}
public static function logo_uri() {
public static function logo_uri($protocol=NULL) {
list ($path,$suffix) = explode('.',static::$logo);
return URL::site(Route::get('default/media')->uri(array('file'=>$path.'.'.$suffix),array('alt'=>static::sitename())),'http');
return URL::site(Route::get('default/media')->uri(array('file'=>$path.'.'.$suffix),array('alt'=>static::sitename())),$protocol);
}
/**
@@ -136,14 +136,17 @@ class Config extends Kohana_Config {
return Company::instance()->site($format);
}
public static function sitename() {
return Company::instance()->name();
}
/**
* Work out our site mode (dev,test,prod)
*/
public static function sitemode() {
return Company::instance()->sitemode();
}
public static function sitename() {
return Company::instance()->name();
}
/**
* See if our emails for the template should be sent to configured admin(s)
*