Commit 500f8e5a authored by Siebrand Mazeland's avatar Siebrand Mazeland

* i18n/L10n updates.

* remove superfluous whitespace.
parent e0952bf5
......@@ -69,4 +69,3 @@ class FirePHPPlugin extends Plugin
return true;
}
}
......@@ -46,7 +46,6 @@ if (!defined('STATUSNET')) {
*
* @seeAlso Location
*/
class GeoURLPlugin extends Plugin
{
public $ping = 'http://geourl.org/ping/';
......@@ -58,7 +57,6 @@ class GeoURLPlugin extends Plugin
*
* @return boolean event handler flag
*/
function onEndShowHeadElements($action)
{
$name = $action->trimmed('action');
......@@ -94,7 +92,6 @@ class GeoURLPlugin extends Plugin
*
* @return boolean event handler flag
*/
function onHandleQueuedNotice(&$notice)
{
if ($notice->is_local == 1) {
......
......@@ -46,7 +46,6 @@ if (!defined('STATUSNET')) {
*
* @seeAlso Location
*/
class GeonamesPlugin extends Plugin
{
const LOCATION_NS = 1;
......@@ -71,7 +70,6 @@ class GeonamesPlugin extends Plugin
*
* @return boolean whether to continue (results in $location)
*/
function onLocationFromName($name, $language, &$location)
{
$loc = $this->getCache(array('name' => $name,
......@@ -129,7 +127,6 @@ class GeonamesPlugin extends Plugin
*
* @return boolean whether to continue (results in $location)
*/
function onLocationFromId($id, $ns, $language, &$location)
{
if ($ns != self::LOCATION_NS) {
......@@ -198,7 +195,6 @@ class GeonamesPlugin extends Plugin
*
* @return boolean whether to continue (results in $location)
*/
function onLocationFromLatLon($lat, $lon, $language, &$location)
{
// Make sure they're canonical
......@@ -276,7 +272,6 @@ class GeonamesPlugin extends Plugin
*
* @return boolean whether to continue
*/
function onLocationNameLanguage($location, $language, &$name)
{
if ($location->location_ns != self::LOCATION_NS) {
......@@ -344,7 +339,6 @@ class GeonamesPlugin extends Plugin
*
* @return boolean whether to continue
*/
function onLocationUrl($location, &$url)
{
if ($location->location_ns != self::LOCATION_NS) {
......@@ -368,7 +362,6 @@ class GeonamesPlugin extends Plugin
*
* @return boolean whether to continue
*/
function onLocationRdfUrl($location, &$url)
{
if ($location->location_ns != self::LOCATION_NS) {
......
......@@ -132,7 +132,6 @@ class GravatarPlugin extends Plugin
return false;
}
function gravatar_save()
{
$cur = common_current_user();
......
......@@ -44,7 +44,7 @@ class ImapManager extends IoManager
*/
public static function get()
{
throw new Exception('ImapManager should be created using it\'s constructor, not the static get method');
throw new Exception(_m('ImapManager should be created using its constructor, not the using the static get method.'));
}
/**
......
......@@ -60,13 +60,13 @@ class LdapCommon
$this->ldap_config = $this->get_ldap_config();
if(!isset($this->host)){
throw new Exception("must specify a host");
throw new Exception(_m("A host must be specified."));
}
if(!isset($this->basedn)){
throw new Exception("must specify a basedn");
throw new Exception(_m('"basedn" must be specified.'));
}
if(!isset($this->attributes['username'])){
throw new Exception("username attribute must be set.");
throw new Exception(_m('The username attribute must be set.'));
}
}
......@@ -173,7 +173,7 @@ class LdapCommon
$ldap = $this->get_ldap_connection($config);
$entry = $this->get_user($username,array(),$ldap);
$newCryptedPassword = $this->hashPassword($newpassword, $this->password_encoding);
if ($newCryptedPassword===false) {
return false;
......@@ -254,15 +254,14 @@ class LdapCommon
* @return string The hashed password.
*
*/
function hashPassword( $passwordClear, $encodageType )
function hashPassword( $passwordClear, $encodageType )
{
$encodageType = strtolower( $encodageType );
switch( $encodageType ) {
case 'crypt':
$cryptedPassword = '{CRYPT}' . crypt($passwordClear,$this->randomSalt(2));
case 'crypt':
$cryptedPassword = '{CRYPT}' . crypt($passwordClear,$this->randomSalt(2));
break;
case 'ext_des':
// extended des crypt. see OpenBSD crypt man page.
if ( ! defined( 'CRYPT_EXT_DES' ) || CRYPT_EXT_DES == 0 ) {return FALSE;} //Your system crypt library does not support extended DES encryption.
......@@ -345,8 +344,7 @@ class LdapCommon
* @param int $length The length of the salt string to generate.
* @return string The generated salt string.
*/
function randomSalt( $length )
function randomSalt( $length )
{
$possible = '0123456789'.
'abcdefghijklmnopqrstuvwxyz'.
......@@ -360,10 +358,8 @@ class LdapCommon
return $str;
}
}
class LdapInvalidCredentialsException extends Exception
{
}
<?php
/**
/**
* StatusNet, the distributed open-source microblogging tool
*
* Cache the LDAP schema in memcache to improve performance
......@@ -32,14 +32,14 @@ class MemcacheSchemaCache implements Net_LDAP2_SchemaCache
protected $cacheKey;
/**
* Initialize the simple cache
*
* Config is as following:
* memcache memcache instance
* cachekey the key in the cache to look at
*
* @param array $cfg Config array
*/
* Initialize the simple cache
*
* Config is as following:
* memcache memcache instance
* cachekey the key in the cache to look at
*
* @param array $cfg Config array
*/
public function MemcacheSchemaCache($cfg)
{
$this->c = $cfg['c'];
......@@ -57,18 +57,18 @@ class MemcacheSchemaCache implements Net_LDAP2_SchemaCache
}
/**
* Store a schema object in the cache
*
* This method will be called, if Net_LDAP2 has fetched a fresh
* schema object from LDAP and wants to init or refresh the cache.
*
* To invalidate the cache and cause Net_LDAP2 to refresh the cache,
* you can call this method with null or false as value.
* The next call to $ldap->schema() will then refresh the caches object.
*
* @param mixed $schema The object that should be cached
* @return true|Net_LDAP2_Error|false
*/
* Store a schema object in the cache
*
* This method will be called, if Net_LDAP2 has fetched a fresh
* schema object from LDAP and wants to init or refresh the cache.
*
* To invalidate the cache and cause Net_LDAP2 to refresh the cache,
* you can call this method with null or false as value.
* The next call to $ldap->schema() will then refresh the caches object.
*
* @param mixed $schema The object that should be cached
* @return true|Net_LDAP2_Error|false
*/
public function storeSchema($schema) {
return $this->c->set($this->cacheKey, $schema);
}
......
......@@ -40,7 +40,7 @@ class LilUrlPlugin extends UrlShortenerPlugin
function onInitializePlugin(){
parent::onInitializePlugin();
if(!isset($this->serviceUrl)){
throw new Exception("must specify a serviceUrl");
throw new Exception(_m('A serviceUrl must be specified.'));
}
}
......@@ -71,4 +71,3 @@ class LilUrlPlugin extends UrlShortenerPlugin
return true;
}
}
......@@ -49,7 +49,6 @@ define('LINKBACKPLUGIN_VERSION', '0.1');
*
* @see Event
*/
class LinkbackPlugin extends Plugin
{
var $notice = null;
......@@ -154,7 +153,6 @@ class LinkbackPlugin extends Plugin
// Largely cadged from trackback_cls.php by
// Ran Aroussi <ran@blogish.org>, GPL2 or any later version
// http://phptrackback.sourceforge.net/
function getTrackback($text, $url)
{
if (preg_match_all('/(<rdf:RDF.*?<\/rdf:RDF>)/sm', $text, $match, PREG_SET_ORDER)) {
......
......@@ -48,7 +48,6 @@ if (!defined('STATUSNET')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
class MemcachePlugin extends Plugin
{
static $cacheInitialized = false;
......@@ -70,7 +69,6 @@ class MemcachePlugin extends Plugin
*
* @return boolean flag value
*/
function onInitializePlugin()
{
if (self::$cacheInitialized) {
......@@ -101,7 +99,6 @@ class MemcachePlugin extends Plugin
*
* @return boolean hook success
*/
function onStartCacheGet(&$key, &$value)
{
$this->_ensureConn();
......@@ -121,7 +118,6 @@ class MemcachePlugin extends Plugin
*
* @return boolean hook success
*/
function onStartCacheSet(&$key, &$value, &$flag, &$expiry, &$success)
{
$this->_ensureConn();
......@@ -160,7 +156,6 @@ class MemcachePlugin extends Plugin
*
* @return boolean hook success
*/
function onStartCacheDelete(&$key, &$success)
{
$this->_ensureConn();
......@@ -194,7 +189,6 @@ class MemcachePlugin extends Plugin
*
* @return void
*/
private function _ensureConn()
{
if (empty($this->_conn)) {
......@@ -253,4 +247,3 @@ class MemcachePlugin extends Plugin
return true;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment