Skip to content
This repository has been archived by the owner on Nov 25, 2020. It is now read-only.

Commit

Permalink
Merge pull request #282 from echampet/fixrefactor
Browse files Browse the repository at this point in the history
Fixrefactor
  • Loading branch information
cdujeu committed Sep 6, 2013
2 parents 3e5e571 + a9c69ae commit 2a760d8
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion core/src/plugins/access.wms/i18n/de.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
"4" => "Style",
"5" => "Stichwörter",
"6" => "Vorschau",
)
);
2 changes: 1 addition & 1 deletion core/src/plugins/access.wms/i18n/en.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
"4" => "Style",
"5" => "Keywords",
"6" => "Projection",
)
);
2 changes: 1 addition & 1 deletion core/src/plugins/access.wms/i18n/es.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
"4" => "Estilo",
"5" => "Palábras Clave",
"6" => "Proyección",
)
);
2 changes: 1 addition & 1 deletion core/src/plugins/editor.openlayer/i18n/de.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
"8" => "Filter",
"9" => "Suchen",
"10" => "Löschen",
)
);
2 changes: 1 addition & 1 deletion core/src/plugins/editor.openlayer/i18n/en.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
"8" => "Filter",
"9" => "Search",
"10" => "Clear",
)
);
2 changes: 1 addition & 1 deletion core/src/plugins/editor.openlayer/i18n/es.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
"8" => "Filtrar",
"9" => "Buscar",
"10" => "Limpiar",
)
);
2 changes: 1 addition & 1 deletion core/src/plugins/editor.openlayer/i18n/fr.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
"8" => "Filtre",
"9" => "Chercher",
"10" => "Effacer",
)
);
2 changes: 1 addition & 1 deletion core/src/plugins/editor.openlayer/i18n/pt.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
"8" => "Filtro",
"9" => "Procurar",
"10" => "Limpar",
)
);
38 changes: 19 additions & 19 deletions core/src/plugins/meta.svn/svn_lib.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
*
* @since v1.0.0
*/
public function GetSvnHelp()
function GetSvnHelp()
{
$command = 'svn';
$switches = '--help';
Expand All @@ -116,7 +116,7 @@ public function GetSvnHelp()
*
* @since v1.0.0
*/
public function GetSvnLookHelp()
function GetSvnLookHelp()
{
$command = 'svnlook';
$switches = '--help';
Expand All @@ -133,7 +133,7 @@ public function GetSvnLookHelp()
*
* @since v1.0.0
*/
public function GetSvnAdminHelp()
function GetSvnAdminHelp()
{
$command = 'svnadmin';
$switches = '--help';
Expand All @@ -150,7 +150,7 @@ public function GetSvnAdminHelp()
*
* @since v1.0.0
*/
public function GetSvnVersionHelp()
function GetSvnVersionHelp()
{
$command = 'svnversion';
$switches = '--help';
Expand All @@ -164,7 +164,7 @@ public function GetSvnVersionHelp()
*
* @since v1.0.0
*/
public function GetSvnVersion()
function GetSvnVersion()
{
$command = 'svn';
$switches = '--version';
Expand Down Expand Up @@ -208,7 +208,7 @@ function &GetRepositoryInfo($config){
*
* @since v1.0.0
* */
public function GetHeadRevision($config)
function GetHeadRevision($config)
{
$info = GetRepositoryInfo($config);
$rev = ParseArray($info[IDX_STDOUT], 'revision="', '">');
Expand All @@ -223,7 +223,7 @@ public function GetHeadRevision($config)
*
* @since v1.0.0
*/
public function GetHeadDate($config)
function GetHeadDate($config)
{
$info = GetRepositoryInfo($config);
$timestamp = ParseArray($info[IDX_STDOUT], '<date>', '</date>');
Expand Down Expand Up @@ -269,7 +269,7 @@ function &GetWebspaceInfo($config, $xml_output = true){
*
* @since v1.0.0
*/
public function GetWebspaceRevision($config)
function GetWebspaceRevision($config)
{
$info = GetWebspaceInfo($config);
return ParseArray($info[IDX_STDOUT], 'revision="', '">');
Expand All @@ -284,7 +284,7 @@ public function GetWebspaceRevision($config)
*
* @since v1.0.0
*/
public function GetWebspaceSourcePath($config)
function GetWebspaceSourcePath($config)
{
$info = GetWebspaceInfo($config);
$ws_path = ParseArray($info[IDX_STDOUT], '<url>', '</url>');
Expand All @@ -301,7 +301,7 @@ public function GetWebspaceSourcePath($config)
*
* @since v1.0.0
*/
public function GetWebspaceRevisionDate($config)
function GetWebspaceRevisionDate($config)
{
$info = GetWebspaceInfo($config);
$timestamp = ParseArray($info[IDX_STDOUT], '<date>', '</date>');
Expand Down Expand Up @@ -366,7 +366,7 @@ function &GetWebspaceLog($config, $path){
*
* @since v1.1.0
*/
public function ListRepository($config, $path)
function ListRepository($config, $path)
{
//$rep_root = $config->GetRepositoryRoot();
$rep_root = $config->getOption("REPOSITORY_ROOT").$path;
Expand Down Expand Up @@ -419,7 +419,7 @@ function &GetBranches($config){
*
* @since v1.0.0
*/
public function GetRepositoryPaths($config, $roots, $depth)
function GetRepositoryPaths($config, $roots, $depth)
{
$rep_root = $config->GetRepositoryRoot();
if (!is_array($roots)) {
Expand Down Expand Up @@ -486,7 +486,7 @@ function &BuildSvnDirTree(&$paths, &$tree, $max_level, $parent_dir = ''){
*
* @since v1.0.0
*/
public function UpdateWebspace($config)
function UpdateWebspace($config)
{
$command = 'svn update';
$switches = '--non-interactive';
Expand All @@ -512,7 +512,7 @@ public function UpdateWebspace($config)
*
* @since v1.0.0
*/
public function CheckoutWebspace($config)
function CheckoutWebspace($config)
{
$trunk_path = $config->GetTrunkDir();
$command = 'svn checkout';
Expand Down Expand Up @@ -555,7 +555,7 @@ function &CleanupWebspace($config){
*
* @since v1.0.0
*/
public function SwitchWebspace($config, $path)
function SwitchWebspace($config, $path)
{
if ($path == NULL) {
$path = $config->GetTrunkDir();
Expand All @@ -578,7 +578,7 @@ public function SwitchWebspace($config, $path)
*
* @since v1.0.0
*/
public function GetSvnUsr($config)
function GetSvnUsr($config)
{
$user = $config->GetSvnUser();
$switch = '';
Expand All @@ -596,7 +596,7 @@ public function GetSvnUsr($config)
*
* @since v1.0.0
*/
public function GetSvnPw($config)
function GetSvnPw($config)
{
$pw = $config->GetSvnPassword();
$switch = '';
Expand Down Expand Up @@ -754,7 +754,7 @@ function &GetLineString($handle, $length = 4096){
*
* @since v1.0.0
*/
public function ParseArray (&$array, $startstr, $endstr = NULL)
function ParseArray (&$array, $startstr, $endstr = NULL)
{
$idx = 0;
while ($idx < count($array) && strpos($array[$idx], $startstr) === false) {
Expand Down Expand Up @@ -783,7 +783,7 @@ public function ParseArray (&$array, $startstr, $endstr = NULL)
* @version v.1.1.0
* @since v1.0.0
*/
public function PrintArray($array, $name = '', $encode_html_chars = true)
function PrintArray($array, $name = '', $encode_html_chars = true)
{
if (is_array($array)) {
if (strlen($name) > 0) {
Expand Down

0 comments on commit 2a760d8

Please sign in to comment.