moparisthebest/Simba
1
0
Fork 0
mirror of https://github.com/moparisthebest/Simba synced 2024-11-25 02:32:19 -05:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/Nava2/Simba into Nava2-master

Browse Source
This commit is contained in:
Merlijn Wajer 2011-01-14 19:39:46 +01:00
commit be984cebfe
1 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Extensions/security.sex
View File

@ -58,6 +58,7 @@ const
{$ELSE} {$ELSE}
DirectorySeparator = '/'; DirectorySeparator = '/';
{$ENDIF} {$ENDIF}
LIST_SEPARATOR = ';;';
{ var Settings_DEFAULT_(URL|FILE): Integer; { var Settings_DEFAULT_(URL|FILE): Integer;
Depict the default option for when the Option dialog times out. These values Depict the default option for when the Option dialog times out. These values
@ -141,7 +142,7 @@ begin
'%%%s%%%s%s', '%%%s%%%s%s',
[names[i], DirectorySeparator, copy(path,p+length(paths[i]),Length(path))] [names[i], DirectorySeparator, copy(path,p+length(paths[i]),Length(path))]
); );
writeln(Result); //writeln(Result);
Exit; Exit;
end; end;
p := 0; p := 0;
@ -167,7 +168,7 @@ begin
{$IFDEF EXTENSION} {$IFDEF EXTENSION}
{ Write to the Settings.xml } { Write to the Settings.xml }
tmp := Settings.getKeyValueDef(PathArr[uf][p].name, ''); tmp := Settings.getKeyValueDef(PathArr[uf][p].name, '');
Settings.setKeyValue(PathArr[uf][p].name, tmp + DirectorySeparator + s); Settings.setKeyValue(PathArr[uf][p].name, tmp + LIST_SEPARATOR + s);
{$ENDIF} {$ENDIF}
end; end;
@ -800,10 +801,6 @@ begin
end; end;
end; end;
procedure asdf();
begin
end;
{ {
Loads the settings from the XML document to the forms components. Loads the settings from the XML document to the forms components.
} }
@ -890,9 +887,9 @@ var
begin begin
h := obj.ITEMS.Count - 1; h := obj.ITEMS.Count - 1;
Result := ''; Result := '';
t := DirectorySeparator; t := LIST_SEPARATOR;
for i := 0 to h do for i := 0 to h do
if (obj.ITEMS.Strings[i] <> '') then if (Length(obj.ITEMS.Strings[i]) > 1) then
Result := Result + obj.ITEMS.Strings[i] + t; Result := Result + obj.ITEMS.Strings[i] + t;
Delete(Result, Length(Result)-Length(t), Length(Result)); Delete(Result, Length(Result)-Length(t), Length(Result));
@ -903,12 +900,18 @@ end;
} }
function __TStringsToStrArr(obj: TStrings): TStringArray; function __TStringsToStrArr(obj: TStrings): TStringArray;
var var
i, h: Integer; i, j, h: Integer;
begin begin
SetLength(Result, obj.Count); SetLength(Result, obj.Count);
h := obj.count - 1; h := obj.count - 1;
j := 0;
for i := 0 to h do for i := 0 to h do
Result[i] := obj.Strings[i]; if (length(obj.Strings[i]) > 1) then
begin
Result[j] := obj.Strings[i];
Inc(j);
end;
SetLength(Result, j);
end; end;
{ {
@ -1159,7 +1162,7 @@ var
V: TVariantArray; V: TVariantArray;
{$ENDIF} {$ENDIF}
begin begin
writeln('showing extention form.'); // writeln('showing extention form.');
{$IFNDEF EXTENSION} {$IFNDEF EXTENSION}
V := []; V := [];
ThreadSafeCall('LoadSettingsForm', V); ThreadSafeCall('LoadSettingsForm', V);
@ -1172,8 +1175,9 @@ end;
procedure Init; procedure Init;
var var
i, j, l: Integer; i, j, k, h, l: Integer;
ToolsMenu : TMenuItem; ToolsMenu : TMenuItem;
tmpStrings: TStringArray;
begin; begin;
{ {
Load consts for the User Input Form. Load consts for the User Input Form.
@ -1213,11 +1217,20 @@ begin;
{ {
Load the previously saved settings. Load the previously saved settings.
} }
//s := tmpStrings := Explode(
PathArr[i][j].a := Explode( LIST_SEPARATOR,
DirectorySeparator,
Settings.getKeyValue(PathArr[i][j].name) Settings.getKeyValue(PathArr[i][j].name)
); );
h := 0;
SetLength(PathArr[i][j].a, Length(tmpStrings));
for k := 0 to High(tmpStrings) do
if (Length(tmpStrings[k]) > 1) then
begin
PathArr[i][j].a[h] := tmpStrings[k];
Inc(h);
end;
{$ENDIF} {$ENDIF}
end; end;
end; end;
@ -1286,7 +1299,7 @@ begin;
Settings_FIRE_WALL_ENABLED := True; Settings_FIRE_WALL_ENABLED := True;
{$ENDIF} {$ENDIF}
{ Icon_Lock := GetMufasaBitmap( Icon_Lock := GetMufasaBitmap(
BitmapFromString( BitmapFromString(
48, 48, 48, 48,
'meJzFmAlUk3fWxnG3gI61TqeLa5' + 'meJzFmAlUk3fWxnG3gI61TqeLa5' +
@ -1383,7 +1396,7 @@ begin;
'emQlng3//qpF610H3wzj2TCQAUNZRKf678L0RlQT+Ne94J8qbxz/A' + 'emQlng3//qpF610H3wzj2TCQAUNZRKf678L0RlQT+Ne94J8qbxz/A' +
'NOJAeU=' 'NOJAeU='
) )
);} );
{ Temp hack } { Temp hack }
Icon_Lock := TMufasaBitmap.Create(); Icon_Lock := TMufasaBitmap.Create();
@ -1395,7 +1408,7 @@ end;
procedure Free; procedure Free;
begin begin
// Only here so people won't freak out. :) // Only here so people won't freak out. :)
{ Icon_Lock.Free; } Icon_Lock.Free;
end; end;
{$IFDEF EXTENSION} {$IFDEF EXTENSION}