aliens/SemanticScuttle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: aliens:fix-my-setup
Branches Tags
aliens:fix-my-setup
aliens:master
..
compare: aliens:master
Branches Tags
aliens:fix-my-setup
aliens:master

No commits in common. "fix-my-setup" and "master" have entirely different histories.
fix-my-set ... master

5 changed files with 14 additions and 32 deletions
Show stats Expand all files Collapse all files

6
src/SemanticScuttle/Service/Bookmark.php
View file

@ -504,9 +504,7 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService
'bPrivateNote' => $privateNote,
'bStatus' => intval($status),
'bHash' => $this->getHash($address),
'bShort' => $short,
'bVotes' => 0,
'bVoting' => 0,
'bShort' => $short
);
$sql = 'INSERT INTO '. $this->getTableName()
@ -1138,7 +1136,7 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService
// Delete final /
if (substr($address, -1) == '/') {
$address = substr($address, 0, -1);
$address = substr($address, 0, strlen($address)-2);
}
return $address;

20
src/SemanticScuttle/Service/User.php
View file

@ -103,15 +103,7 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService
GENERAL_ERROR, 'Could not get user',
'', __LINE__, __FILE__, $query, $this->db
);
return [ 'uId' => 0,
'username' => '',
'name' => '',
'email' => '',
'homepage' => '',
'content' => '',
'datetime' => NULL,
'isAdmin' => false,
'privateKeey' => '' ];
return false;
}
$row = $this->db->sql_fetchrow($dbresult);
@ -119,15 +111,7 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService
if ($row) {
return $row;
} else {
return [ 'uId' => 0,
'username' => '',
'name' => '',
'email' => '',
'homepage' => '',
'content' => '',
'datetime' => NULL,
'isAdmin' => false,
'privateKeey' => '' ];
return false;
}
}

12
src/php-gettext/gettext.inc
View file

@ -89,18 +89,18 @@ function get_list_of_locales($locale) {
if ($modifier) {
if ($country) {
if ($charset)
array_push($locale_names, "{$lang}_$country.$charset@$modifier");
array_push($locale_names, "{$lang}_$country@$modifier");
array_push($locale_names, "${lang}_$country.$charset@$modifier");
array_push($locale_names, "${lang}_$country@$modifier");
} elseif ($charset)
array_push($locale_names, "{$lang}.$charset@$modifier");
array_push($locale_names, "${lang}.$charset@$modifier");
array_push($locale_names, "$lang@$modifier");
}
if ($country) {
if ($charset)
array_push($locale_names, "{$lang}_$country.$charset");
array_push($locale_names, "{$lang}_$country");
array_push($locale_names, "${lang}_$country.$charset");
array_push($locale_names, "${lang}_$country");
} elseif ($charset)
array_push($locale_names, "{$lang}.$charset");
array_push($locale_names, "${lang}.$charset");
array_push($locale_names, $lang);
}

2
src/php-gettext/gettext.php
View file

@ -98,7 +98,7 @@ class gettext_reader {
* @param object Reader the StreamReader object
* @param boolean enable_cache Enable or disable caching of strings (default on)
*/
function __construct($Reader, $enable_cache = true) {
function gettext_reader($Reader, $enable_cache = true) {
// If there isn't a StreamReader, turn on short circuit mode.
if (! $Reader || isset($Reader->error) ) {
$this->short_circuit = true;

6
src/php-gettext/streams.php
View file

@ -49,7 +49,7 @@ class StringReader {
var $_pos;
var $_str;
public function __construct($str='') {
function StringReader($str='') {
$this->_str = $str;
$this->_pos = 0;
}
@ -86,7 +86,7 @@ class FileReader {
var $_fd;
var $_length;
public function __construct($filename) {
function FileReader($filename) {
if (file_exists($filename)) {
$this->_length=filesize($filename);
@ -143,7 +143,7 @@ class FileReader {
// Preloads entire file in memory first, then creates a StringReader
// over it (it assumes knowledge of StringReader internals)
class CachedFileReader extends StringReader {
public function __construct($filename) {
function CachedFileReader($filename) {
if (file_exists($filename)) {
$length=filesize($filename);