*** empty log message ***

This commit is contained in:
sebastian 2005-04-05 15:40:44 +00:00
parent 54fd432bfc
commit 13d71ed3c2
20 changed files with 7957 additions and 388 deletions

View file

@ -49,7 +49,7 @@ form { font-size: 12px;
background-color: #F7F9FB; background-color: #F7F9FB;
padding: 0 25px 0 25px; padding: 0 25px 0 25px;
cursor: pointer; cursor: pointer;
width: 150px; width: 170px;
} }
.button_large { font-size: 12px; .button_large { font-size: 12px;
font-weight: bold; font-weight: bold;

View file

@ -536,9 +536,11 @@ class Data {
{ {
$n = 0; $n = 0;
$filePattern = '/(.*).php/'; // all .php files $filePattern = '/(.*).php/'; // all .php files
$functPattern1 = '/tra( )*\(( )*\'([^\']*)\'/iU'; // like tra('edit "$1"', ...); ' $functPattern[] = '/tra( )*\(( )*\'([^\']*)\'/iU'; // like tra('edit "$1"', ...); '
$functPattern2 = '/tra( )*\(( )*"([^"]*)"/iU'; // like tra("edit '$1'", ...); " $functPattern[] = '/tra( )*\(( )*"([^"]*)"/iU'; // like tra("edit '$1'", ...); "
$functPattern[] = '/_retMsg( )*\(( )*\'([^\']*)\'/iU'; // '
$functPattern[] = '/_retMsg( )*\(( )*"([^"]*)"/iU'; // "
$files = File_Find::mapTreeMultiple($file['dir'], 1); $files = File_Find::mapTreeMultiple($file['dir'], 1);
@ -559,20 +561,14 @@ class Data {
return FALSE; return FALSE;
foreach ($data as $line) { foreach ($data as $line) {
if (preg_match_all($functPattern1, $line, $m)) { // collact all matches foreach ($functPattern as $pattern) {
foreach ($m[3] as $match) { if (preg_match_all($pattern, $line, $m)) { // collact all matches
$n++; foreach ($m[3] as $match) {
$matches[$match] = $n; $n++;
$matches[$match] = $n;
}
} }
} }
if (preg_match_all($functPattern2, $line, $m)) { // collact all matches
foreach ($m[3] as $match) {
$n++;
$matches[$match] = $n;
}
}
} }
if (is_array($matches)==FALSE) if (is_array($matches)==FALSE)

View file

@ -359,7 +359,7 @@ class Display {
<input type="hidden" name="pos" value="'.$pos.'">'; <input type="hidden" name="pos" value="'.$pos.'">';
for($n=1; $n<=$amount; $n++) { for($n=1; $n<=$amount; $n++) {
$html .= "<tr><td><input name='newKey[$n]' size='50'></td></tr>"; $html .= "<tr><td><input name='newKey[$n]' type='text' size='100'></td></tr>";
} }
$html .= $html .=

View file

@ -30,4 +30,9 @@
<Name>Serbian(SR)</Name> <Name>Serbian(SR)</Name>
<NativeName>Serbian</NativeName> <NativeName>Serbian</NativeName>
</language> </language>
<language>
<Id>es.Spanish</Id>
<Name>Spanish(SR)</Name>
<NativeName>Spanish</NativeName>
</language>
</languages> </languages>

View file

@ -1,161 +1,161 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<language> <language>
<Id>en.English</Id> <Id>en.English</Id>
<status>checked</status> <status>checked</status>
<item> <item>
<key>collect expressions</key> <key>collect expressions</key>
<value>collect expressions</value> <value>collect expressions</value>
</item> </item>
<item> <item>
<key>localizer</key> <key>localizer</key>
<value>localizer</value> <value>localizer</value>
</item> </item>
<item> <item>
<key>$1 file already exist in $2</key> <key>$1 file already exist in $2</key>
<value>$1 file already exist in $2</value> <value>$1 file already exist in $2</value>
</item> </item>
<item> <item>
<key>edit &quot;$1&quot;</key> <key>edit &quot;$1&quot;</key>
<value>edit &quot;$1&quot;</value> <value>edit &quot;$1&quot;</value>
</item> </item>
<item> <item>
<key>edit &apos;$1&apos;</key> <key>edit &apos;$1&apos;</key>
<value>edit &apos;$1&apos;</value> <value>edit &apos;$1&apos;</value>
</item> </item>
<item> <item>
<key>create new language file $1</key> <key>create new language file $1</key>
<value>create new language file $1</value> <value>create new language file $1</value>
</item> </item>
<item> <item>
<key>create new language file in</key> <key>create new language file in</key>
<value>create new language file in</value> <value>create new language file in</value>
</item> </item>
<item> <item>
<key>delete</key> <key>delete</key>
<value>delete</value> <value>delete</value>
</item> </item>
<item> <item>
<key>edit</key> <key>edit</key>
<value>edit</value> <value>edit</value>
</item> </item>
<item> <item>
<key>entrys:</key> <key>entrys:</key>
<value>entrys:</value> <value>entrys:</value>
</item> </item>
<item> <item>
<key>$1 and $2 files already exist in $3</key> <key>$1 and $2 files already exist in $3</key>
<value>$1 and $2 files already exist in $3</value> <value>$1 and $2 files already exist in $3</value>
</item> </item>
<item> <item>
<key>ok</key> <key>ok</key>
<value>ok</value> <value>ok</value>
</item> </item>
<item> <item>
<key>add new fields:</key> <key>add new fields:</key>
<value>add new fields:</value> <value>add new fields:</value>
</item> </item>
<item> <item>
<key>name</key> <key>name</key>
<value>name</value> <value>name</value>
</item> </item>
<item> <item>
<key>native name</key> <key>native name</key>
<value>native name</value> <value>native name</value>
</item> </item>
<item> <item>
<key>code</key> <key>code</key>
<value>code</value> <value>code</value>
</item> </item>
<item> <item>
<key>source:</key> <key>source:</key>
<value>source:</value> <value>source:</value>
</item> </item>
<item> <item>
<key>target:</key> <key>target:</key>
<value>target:</value> <value>target:</value>
</item> </item>
<item> <item>
<key>manage languages</key> <key>manage languages</key>
<value>manage languages</value> <value>manage languages</value>
</item> </item>
<item> <item>
<key>choose language</key> <key>choose language</key>
<value>choose language</value> <value>choose language</value>
</item> </item>
<item> <item>
<key>key:</key> <key>key:</key>
<value>key:</value> <value>key:</value>
</item> </item>
<item> <item>
<key>cannot open $1</key> <key>cannot open $1</key>
<value>cannot open $1</value> <value>cannot open $1</value>
</item> </item>
<item> <item>
<key>key &quot;$1&quot; already exists in $2-file</key> <key>key &quot;$1&quot; already exists in $2-file</key>
<value>key &quot;$1&quot; already exists in $2-file</value> <value>key &quot;$1&quot; already exists in $2-file</value>
</item> </item>
<item> <item>
<key>show only untranslated</key> <key>show only untranslated</key>
<value>show only untranslated</value> <value>show only untranslated</value>
</item> </item>
<item> <item>
<key>cannot read $1</key> <key>cannot read $1</key>
<value>cannot read $1</value> <value>cannot read $1</value>
</item> </item>
<item> <item>
<key>translate from:</key> <key>translate from:</key>
<value>translate from:</value> <value>translate from:</value>
</item> </item>
<item> <item>
<key>really delete this entry?</key> <key>really delete this entry?</key>
<value>really delete this entry?</value> <value>really delete this entry?</value>
</item> </item>
<item> <item>
<key>fully translated</key> <key>fully translated</key>
<value>completely processed</value> <value>completely processed</value>
</item> </item>
<item> <item>
<key>after</key> <key>after</key>
<value>after</value> <value>after</value>
</item> </item>
<item> <item>
<key>go</key> <key>go</key>
<value>go</value> <value>go</value>
</item> </item>
<item> <item>
<key>back</key> <key>back</key>
<value>back</value> <value>back</value>
</item> </item>
<item> <item>
<key>and select file type</key> <key>and select file type</key>
<value>and select file type</value> <value>and select file type</value>
</item> </item>
<item> <item>
<key>and enter a positive integer value</key> <key>and enter a positive integer value</key>
<value>and enter a positive integer value</value> <value>and enter a positive integer value</value>
</item> </item>
<item> <item>
<key>save to file</key> <key>save to file</key>
<value>save to file</value> <value>save to file</value>
</item> </item>
<item> <item>
<key>add new language</key> <key>add new language</key>
<value>add new language</value> <value>add new language</value>
</item> </item>
<item> <item>
<key>create language files</key> <key>create language files</key>
<value>create language files</value> <value>create language files</value>
</item> </item>
<item> <item>
<key>at begin</key> <key>at begin</key>
<value>at begin</value> <value>at begin</value>
</item> </item>
<item> <item>
<key>at end</key> <key>at end</key>
<value>at end</value> <value>at end</value>
</item> </item>
<item> <item>
<key>key</key> <key>key</key>
<value>key</value> <value>key</value>
</item> </item>
</language> </language>

View file

@ -149,8 +149,8 @@ switch ($_REQUEST[action]) {
'base' => $_REQUEST['base'], 'base' => $_REQUEST['base'],
'Id' => _DEFAULT_LANG_); 'Id' => _DEFAULT_LANG_);
#$newKeys = Data::collectExprPHP($file); $newKeys = Data::collectExprPHP($file);
$newKeys = Data::collectExprTPL($file); $newKeys = array_merge($newKeys, Data::collectExprTPL($file));
$msg = Data::checkKeys($file, $newKeys); $msg = Data::checkKeys($file, $newKeys);

View file

@ -12,7 +12,7 @@ require_once('helpfunctions.php');
define('_DEFAULT_LANG_', 'en.English'); define('_DEFAULT_LANG_', 'en.English');
define('_PREFIX_', 'locals'); define('_PREFIX_', 'locals');
define('_PREFIX_GLOBAL_','globals'); #define('_PREFIX_GLOBAL_','globals');
define('_LANG_BASE_', 'xml'); define('_LANG_BASE_', 'xml');
define('_DENY_HTML_', FALSE); define('_DENY_HTML_', FALSE);
define('_ENCODING_', 'UTF-8'); define('_ENCODING_', 'UTF-8');

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -1,11 +1,226 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<language> <language>
<status />
<Id>en.English</Id> <Id>en.English</Id>
<item>
<key>$1 must be $2</key>
<value />
</item>
<item>
<key>Access denied.</key>
<value />
</item>
<item>
<key>Already active Playlist</key>
<value />
</item>
<item>
<key>Audioclip Data saved</key>
<value />
</item>
<item>
<key>Cannot create Playlist</key>
<value />
</item>
<item>
<key>Cannot delete this Playlist</key>
<value />
</item>
<item>
<key>Cannot move item</key>
<value />
</item>
<item>
<key>Cannot remove Item from Playlist</key>
<value />
</item>
<item>
<key>ChangeFadeInfo failed</key>
<value />
</item>
<item>
<key>Do</key>
<value />
</item>
<item>
<key>Entry $1 was already on SP since $2.nMoved to Top.</key>
<value />
</item>
<item>
<key>Entry added at $1 with ScheduleId: $2</key>
<value />
</item>
<item>
<key>Entry with ScheduleId $1 removed</key>
<value />
</item>
<item>
<key>Error on add item to Playlist</key>
<value />
</item>
<item>
<key>Error saving Settings</key>
<value />
</item>
<item>
<key>Error uploading Logo</key>
<value />
</item>
<item>
<key>Error: $1</key>
<value />
</item>
<item>
<key>File $1 was not uploadet.</key>
<value />
</item>
<item>
<key>Folder is not empty. You can override this protection by clicking DEL again</key>
<value />
</item>
<item>
<key>Found looked Playlist</key>
<value />
</item>
<item>
<key>Invalid Form Data</key>
<value />
</item>
<item>
<key>Login failed</key>
<value />
</item>
<item>
<key>Metadata saved</key>
<value />
</item>
<item>
<key>Missing value for $1</key>
<value />
</item>
<item>
<key>No Item(s) selected</key>
<value />
</item>
<item>
<key>No Playlist is looked by You</key>
<value />
</item>
<item>
<key>Note: Station Preferences not setup proberly.</key>
<value />
</item>
<item>
<key>Password changed</key>
<value />
</item>
<item>
<key>Passwords do not match.</key>
<value />
</item>
<item>
<key>Playlist &quot;$1&quot; activated</key>
<value />
</item>
<item>
<key>Playlist &quot;$1&quot; released</key>
<value />
</item>
<item>
<key>Playlist &quot;$1&quot; reverted</key>
<value />
</item>
<item>
<key>Playlist &quot;$1&quot; saved</key>
<value />
</item>
<item>
<key>Playlist is looked by $1</key>
<value />
</item>
<item>
<key>ScratchPad length is not set in System Preferences, so it cannot be used.</key>
<value />
</item>
<item>
<key>Select a Value</key>
<value />
</item>
<item>
<key>Settings saved</key>
<value />
</item>
<item>
<key>Stream Data changed</key>
<value />
</item>
<item>
<key>Stream Data saved</key>
<value />
</item>
<item>
<key>Subject $1 added.</key>
<value />
</item>
<item>
<key>Target is not Folder</key>
<value />
</item>
<item>
<key>Unable to release Playlist</key>
<value />
</item>
<item>
<key>Unable to revert to looked state</key>
<value />
</item>
<item>
<key>Unable to set &quot;$1&quot; to &quot;$2&quot; langue &quot;$3&quot;</key>
<value />
</item>
<item>
<key>Unable to set $1: $2</key>
<value />
</item>
<item>
<key>Upload of file $1 was incomplete.</key>
<value />
</item>
<item>
<key>Uploaded file $1 is greater than LiveSupport system setting.</key>
<value />
</item>
<item>
<key>Uploaded file $1 is greater than setting in php.ini.</key>
<value />
</item>
<item>
<key>Wrong old pasword.</key>
<value />
</item>
<item>
<key>You have an Playlist already activated,n first close it</key>
<value />
</item>
<item>
<key>Access</key>
<value />
</item>
<item> <item>
<key>Activate this Playlist</key> <key>Activate this Playlist</key>
<value /> <value />
</item> </item>
<item>
<key>Add Audio</key>
<value />
</item>
<item>
<key>Add Criteria</key>
<value />
</item>
<item>
<key>Add to Playlist</key>
<value />
</item>
<item> <item>
<key>Add to ScratchPad</key> <key>Add to ScratchPad</key>
<value /> <value />
@ -14,6 +229,58 @@
<key>Add to active Playlist</key> <key>Add to active Playlist</key>
<value /> <value />
</item> </item>
<item>
<key>Album</key>
<value />
</item>
<item>
<key>Artist</key>
<value />
</item>
<item>
<key>Artist web page</key>
<value />
</item>
<item>
<key>Audio file information web page</key>
<value />
</item>
<item>
<key>Audio source web page</key>
<value />
</item>
<item>
<key>BPM</key>
<value />
</item>
<item>
<key>Bitrate</key>
<value />
</item>
<item>
<key>Browse</key>
<value />
</item>
<item>
<key>Buy CD web page</key>
<value />
</item>
<item>
<key>CW</key>
<value />
</item>
<item>
<key>Cancel</key>
<value />
</item>
<item>
<key>Catalog number</key>
<value />
</item>
<item>
<key>Category</key>
<value />
</item>
<item> <item>
<key>Change Fadein</key> <key>Change Fadein</key>
<value /> <value />
@ -27,79 +294,11 @@
<value /> <value />
</item> </item>
<item> <item>
<key>Delete File</key> <key>Channels</key>
<value /> <value />
</item> </item>
<item> <item>
<key>Display this Playlist</key> <key>Checksum</key>
<value />
</item>
<item>
<key>Edit File</key>
<value />
</item>
<item>
<key>Edit Metadata</key>
<value />
</item>
<item>
<key>Insert Playlist here</key>
<value />
</item>
<item>
<key>List Folder</key>
<value />
</item>
<item>
<key>Listen to File</key>
<value />
</item>
<item>
<key>New Playlist using File</key>
<value />
</item>
<item>
<key>Remove File from Playlist</key>
<value />
</item>
<item>
<key>Remove Playlist</key>
<value />
</item>
<item>
<key>Remove from Scratchpad</key>
<value />
</item>
<item>
<key>Save and Close Playlist</key>
<value />
</item>
<item>
<key>Help</key>
<value />
</item>
<item>
<key>Access</key>
<value />
</item>
<item>
<key>Add Audio</key>
<value />
</item>
<item>
<key>Add to Playlist</key>
<value />
</item>
<item>
<key>Artist</key>
<value />
</item>
<item>
<key>Browse</key>
<value />
</item>
<item>
<key>CW</key>
<value /> <value />
</item> </item>
<item> <item>
@ -110,6 +309,22 @@
<key>Clear Playlist</key> <key>Clear Playlist</key>
<value /> <value />
</item> </item>
<item>
<key>Composer</key>
<value />
</item>
<item>
<key>Conductor</key>
<value />
</item>
<item>
<key>Contributor</key>
<value />
</item>
<item>
<key>Copyright</key>
<value />
</item>
<item> <item>
<key>Count</key> <key>Count</key>
<value /> <value />
@ -126,14 +341,34 @@
<key>Data</key> <key>Data</key>
<value /> <value />
</item> </item>
<item>
<key>Date</key>
<value />
</item>
<item> <item>
<key>Day</key> <key>Day</key>
<value /> <value />
</item> </item>
<item>
<key>Delete File</key>
<value />
</item>
<item> <item>
<key>Delete Playlist</key> <key>Delete Playlist</key>
<value /> <value />
</item> </item>
<item>
<key>Description</key>
<value />
</item>
<item>
<key>Disc number</key>
<value />
</item>
<item>
<key>Display this Playlist</key>
<value />
</item>
<item> <item>
<key>Duration</key> <key>Duration</key>
<value /> <value />
@ -142,6 +377,22 @@
<key>Edit</key> <key>Edit</key>
<value /> <value />
</item> </item>
<item>
<key>Edit File</key>
<value />
</item>
<item>
<key>Edit Metadata</key>
<value />
</item>
<item>
<key>Encoded by</key>
<value />
</item>
<item>
<key>Encoder software used</key>
<value />
</item>
<item> <item>
<key>Fade</key> <key>Fade</key>
<value /> <value />
@ -158,30 +409,98 @@
<key>File Management</key> <key>File Management</key>
<value /> <value />
</item> </item>
<item>
<key>File Type</key>
<value />
</item>
<item>
<key>File format</key>
<value />
</item>
<item>
<key>File type</key>
<value />
</item>
<item> <item>
<key>Folder Structure</key> <key>Folder Structure</key>
<value /> <value />
</item> </item>
<item>
<key>Format</key>
<value />
</item>
<item>
<key>Frequency</key>
<value />
</item>
<item>
<key>Genre</key>
<value />
</item>
<item> <item>
<key>Go</key> <key>Go</key>
<value /> <value />
</item> </item>
<item>
<key>Group Name</key>
<value />
</item>
<item>
<key>Help</key>
<value />
</item>
<item>
<key>ISRC number</key>
<value />
</item>
<item>
<key>Insert Playlist here</key>
<value />
</item>
<item> <item>
<key>Item</key> <key>Item</key>
<value /> <value />
</item> </item>
<item> <item>
<key>KW</key> <key>Label</key>
<value />
</item>
<item>
<key>Language</key>
<value />
</item>
<item>
<key>Length</key>
<value />
</item>
<item>
<key>Length&lt;br&gt;&lt;small&gt;Enter zero for Live Stream&lt;/small&gt;</key>
<value /> <value />
</item> </item>
<item> <item>
<key>Library Search</key> <key>Library Search</key>
<value /> <value />
</item> </item>
<item>
<key>List Folder</key>
<value />
</item>
<item>
<key>Listen to File</key>
<value />
</item>
<item> <item>
<key>Local Time</key> <key>Local Time</key>
<value /> <value />
</item> </item>
<item>
<key>Lyricist</key>
<value />
</item>
<item>
<key>Lyrics</key>
<value />
</item>
<item> <item>
<key>MDataXML</key> <key>MDataXML</key>
<value /> <value />
@ -190,6 +509,14 @@
<key>Main</key> <key>Main</key>
<value /> <value />
</item> </item>
<item>
<key>Maximum length of ScratchPad</key>
<value />
</item>
<item>
<key>Media File</key>
<value />
</item>
<item> <item>
<key>Media Library</key> <key>Media Library</key>
<value /> <value />
@ -206,6 +533,10 @@
<key>Monthly View</key> <key>Monthly View</key>
<value /> <value />
</item> </item>
<item>
<key>Mood</key>
<value />
</item>
<item> <item>
<key>Move</key> <key>Move</key>
<value /> <value />
@ -226,10 +557,18 @@
<key>New</key> <key>New</key>
<value /> <value />
</item> </item>
<item>
<key>New Password</key>
<value />
</item>
<item> <item>
<key>New Playlist</key> <key>New Playlist</key>
<value /> <value />
</item> </item>
<item>
<key>New Playlist using File</key>
<value />
</item>
<item> <item>
<key>New Playlist using Item</key> <key>New Playlist using Item</key>
<value /> <value />
@ -250,14 +589,46 @@
<key>No objects</key> <key>No objects</key>
<value /> <value />
</item> </item>
<item>
<key>Old Password</key>
<value />
</item>
<item> <item>
<key>Open last Playlist</key> <key>Open last Playlist</key>
<value /> <value />
</item> </item>
<item>
<key>Operator</key>
<value />
</item>
<item>
<key>Orchestra or band</key>
<value />
</item>
<item>
<key>Original artist</key>
<value />
</item>
<item>
<key>Original lyricist</key>
<value />
</item>
<item>
<key>PL Editor</key>
<value />
</item>
<item> <item>
<key>Page</key> <key>Page</key>
<value /> <value />
</item> </item>
<item>
<key>Password</key>
<value />
</item>
<item>
<key>Playlist</key>
<value />
</item>
<item> <item>
<key>Playlist Editor</key> <key>Playlist Editor</key>
<value /> <value />
@ -266,10 +637,22 @@
<key>Playlist Metadata</key> <key>Playlist Metadata</key>
<value /> <value />
</item> </item>
<item>
<key>Radio station name</key>
<value />
</item>
<item>
<key>Radio station web page</key>
<value />
</item>
<item> <item>
<key>Range</key> <key>Range</key>
<value /> <value />
</item> </item>
<item>
<key>Rating</key>
<value />
</item>
<item> <item>
<key>RawAnalyze</key> <key>RawAnalyze</key>
<value /> <value />
@ -278,14 +661,62 @@
<key>Remove</key> <key>Remove</key>
<value /> <value />
</item> </item>
<item>
<key>Remove File from Playlist</key>
<value />
</item>
<item>
<key>Remove Playlist</key>
<value />
</item>
<item> <item>
<key>Remove Selected</key> <key>Remove Selected</key>
<value /> <value />
</item> </item>
<item>
<key>Remove from Scratchpad</key>
<value />
</item>
<item>
<key>Repeat Password</key>
<value />
</item>
<item>
<key>Report date/time</key>
<value />
</item>
<item>
<key>Report location</key>
<value />
</item>
<item>
<key>Report organizations</key>
<value />
</item>
<item>
<key>Reset</key>
<value />
</item>
<item>
<key>Retype Password</key>
<value />
</item>
<item> <item>
<key>Revert to Saved</key> <key>Revert to Saved</key>
<value /> <value />
</item> </item>
<item>
<key>Rows Per Page</key>
<value />
</item>
<item>
<key>Rows per Page</key>
<value />
</item>
<item>
<key>Sample rate</key>
<value />
</item>
<item> <item>
<key>Save Playlist</key> <key>Save Playlist</key>
<value /> <value />
@ -294,6 +725,10 @@
<key>Save and Close</key> <key>Save and Close</key>
<value /> <value />
</item> </item>
<item>
<key>Save and Close Playlist</key>
<value />
</item>
<item> <item>
<key>Scheduler</key> <key>Scheduler</key>
<value /> <value />
@ -310,10 +745,26 @@
<key>Search</key> <key>Search</key>
<value /> <value />
</item> </item>
<item>
<key>Search Library</key>
<value />
</item>
<item> <item>
<key>Signed in</key> <key>Signed in</key>
<value /> <value />
</item> </item>
<item>
<key>Station Logo</key>
<value />
</item>
<item>
<key>Station Logo Path</key>
<value />
</item>
<item>
<key>Station Name</key>
<value />
</item>
<item> <item>
<key>Station Settings</key> <key>Station Settings</key>
<value /> <value />
@ -322,14 +773,42 @@
<key>Station Time</key> <key>Station Time</key>
<value /> <value />
</item> </item>
<item>
<key>Station URL</key>
<value />
</item>
<item>
<key>StationPrefs</key>
<value />
</item>
<item> <item>
<key>Stream</key> <key>Stream</key>
<value /> <value />
</item> </item>
<item>
<key>Stream URL</key>
<value />
</item>
<item>
<key>Subject</key>
<value />
</item>
<item>
<key>Submit</key>
<value />
</item>
<item>
<key>System Settings</key>
<value />
</item>
<item> <item>
<key>Talk</key> <key>Talk</key>
<value /> <value />
</item> </item>
<item>
<key>Time</key>
<value />
</item>
<item> <item>
<key>Title</key> <key>Title</key>
<value /> <value />
@ -342,6 +821,10 @@
<key>Today</key> <key>Today</key>
<value /> <value />
</item> </item>
<item>
<key>Track number</key>
<value />
</item>
<item> <item>
<key>Tree view</key> <key>Tree view</key>
<value /> <value />
@ -350,14 +833,26 @@
<key>Type</key> <key>Type</key>
<value /> <value />
</item> </item>
<item>
<key>Upload</key>
<value />
</item>
<item> <item>
<key>UploadM</key> <key>UploadM</key>
<value /> <value />
</item> </item>
<item>
<key>User Password</key>
<value />
</item>
<item> <item>
<key>User/Groups</key> <key>User/Groups</key>
<value /> <value />
</item> </item>
<item>
<key>Username</key>
<value />
</item>
<item> <item>
<key>Week</key> <key>Week</key>
<value /> <value />
@ -366,6 +861,14 @@
<key>Weekly View</key> <key>Weekly View</key>
<value /> <value />
</item> </item>
<item>
<key>Year</key>
<value />
</item>
<item>
<key>calendar week</key>
<value />
</item>
<item> <item>
<key>copy</key> <key>copy</key>
<value /> <value />
@ -402,28 +905,4 @@
<key>previous</key> <key>previous</key>
<value /> <value />
</item> </item>
<item>
<key>{$o.name}</key>
<value />
</item>
<item>
<key>{$sec.header}</key>
<value />
</item>
<item>
<key>$1 must be $2</key>
<value />
</item>
<item>
<key>Do</key>
<value />
</item>
<item>
<key>Missing value for $1</key>
<value />
</item>
<item>
<key>Select a Value</key>
<value />
</item>
</language> </language>

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -1,3 +1,5 @@
{assign var="_PL_activeId" value=$PL->getActiveId()}
{if $_results.cnt > 0} {if $_results.cnt > 0}
<form name="SEARCHRESULTS"> <form name="SEARCHRESULTS">
<div class="head" style="width:535px; height: 21px;">&nbsp;</div> <div class="head" style="width:535px; height: 21px;">&nbsp;</div>
@ -46,14 +48,27 @@
##Page##:&nbsp;&nbsp;{$_results.page+1}&nbsp;&nbsp; ##Page##:&nbsp;&nbsp;{$_results.page+1}&nbsp;&nbsp;
##Range##:&nbsp;{$_criteria.offset+1}-{if ($_criteria.offset+$_criteria.limit)>$_results.cnt}{$_results.cnt}{else}{$_criteria.offset+$_criteria.limit}{/if} ##Range##:&nbsp;{$_criteria.offset+1}-{if ($_criteria.offset+$_criteria.limit)>$_results.cnt}{$_results.cnt}{else}{$_criteria.offset+$_criteria.limit}{/if}
</div> </div>
{if $_PL_activeId}
<input type="button" class="button" value="##To Playlist##" onClick="collector_submit('SEARCHRESULTS', 'PL.addItem')"> <select name="SEARCHRESULTS_multiaction">
{else} <option>##Multiple Action:##</option>
<input type="button" class="button" value="##New Playlist##" onClick="collector_submit('SEARCHRESULTS', 'PL.create')"> <option onClick="collector_submit('SEARCHRESULTS', 'SP.addItem')">##Add file(s) to ScratchPad##</option>
{/if} {if $_PL_activeId}
<option onClick="collector_submit('SEARCHRESULTS', 'PL.addItem')">##Add file(s) to active Playlist##</option>
{else}
<option onClick="collector_submit('SEARCHRESULTS', 'PL.create')">##New Playlist using this file(s)##</option>
{/if}
</select>
<script type="text/javascript">
document.forms['SEARCHRESULTS'].elements['SEARCHRESULTS_multiaction'].options[0].selected=true;
//document.forms['SEARCHRESULTS'].elements['all'].checked = false;
//collector_switchAll('SEARCHRESULTS')
</script>
</div> </div>
</form> </form>
{else} {else}
##No match found.## ##No match found.##
{/if} {/if}
{assign var="_PL_activeId" value=NULL}

View file

@ -1,7 +1,7 @@
<!-- start nav --> <!-- start nav -->
<div class="container_nav"> <div class="container_nav">
<ul id="nav"> <ul id="nav">
<!-- <li><a href="{$UI_BROWSER}?id={$START.fid}&act=uploadFileM">##UploadM##</a></li> --> <!-- <li><a href="{$UI_BROWSER}?id={$START.fid}&act=uploadFileM">UploadM</a></li> -->
<li><a href="{$UI_BROWSER}?folderId={$START.fid}&act=editFile">##Add Audio##</a> <li><a href="{$UI_BROWSER}?folderId={$START.fid}&act=editFile">##Add Audio##</a>
<ul> <ul>
<li><a href="{$UI_BROWSER}?folderId={$START.fid}&act=editFile">##File##</a></li> <li><a href="{$UI_BROWSER}?folderId={$START.fid}&act=editFile">##File##</a></li>
@ -16,17 +16,17 @@
</li> </li>
<li><a href="{$UI_BROWSER}?id={$START.fid}&act=PL.simpleManagement">##Playlist Editor##</a></li> <li><a href="{$UI_BROWSER}?id={$START.fid}&act=PL.simpleManagement">##Playlist Editor##</a></li>
<li><a href="{$UI_BROWSER}?act=SCHEDULER">##Scheduler##</a></li> <li><a href="{$UI_BROWSER}?act=SCHEDULER">##Scheduler##</a></li>
<!-- <li><a href="{$UI_BROWSER}?act=MetaDataValues&Main=1">##Metadata##</a></li> --> <!-- <li><a href="{$UI_BROWSER}?act=MetaDataValues&Main=1">Metadata</a></li> -->
<li><a href="{$UI_BROWSER}?act=changeStationPrefs">##Station Settings##</a> <li><a href="{$UI_BROWSER}?act=changeStationPrefs">##Station Settings##</a>
{* {*
<ul> <ul>
<li><a href="{$UI_BROWSER}?act=changeStationPrefs">##Station Settings##</a></li> <li><a href="{$UI_BROWSER}?act=changeStationPrefs">##Station Settings##</a></li>
<li><a href="{$UI_BROWSER}?id={$START.id}&act=subjects">##User/Groups##</a></li> <li><a href="{$UI_BROWSER}?id={$START.id}&act=subjects">##User/Groups##</a></li>
<li><a href="{$UI_BROWSER}?act=fileList&id={$START.fid}">##File List##</a></li> <li><a href="{$UI_BROWSER}?act=fileList&id={$START.fid}">##File List##</a></li>
</ul> </ul>
*} *}
</li> </li>
<li><a href="#" onClick="window.open('help.html','','scrollbars=yes,resizable=yes,width=500,height=400')">##Help##</a></li> <li><a href="#" onClick="window.open('help.html','','scrollbars=yes,resizable=yes,width=500,height=400')">##Help##</a></li>
</ul> </ul>
</div> </div>
<!-- end nav --> <!-- end nav -->

View file

@ -1,4 +1,5 @@
{assign var="_PL_activeId" value=$PL->getActiveId()} {assign var="_PL_activeId" value=$PL->getActiveId()}
<!-- start scratch pad --> <!-- start scratch pad -->
{if is_array($SCRATCHPAD)} {if is_array($SCRATCHPAD)}
<form name="SP"> <form name="SP">
@ -10,9 +11,6 @@
<!-- start table header --> <!-- start table header -->
<tr class="blue_head"> <tr class="blue_head">
<td style="width: 30px"><input type="checkbox" name="all" onClick="collector_switchAll('SP')"></td> <td style="width: 30px"><input type="checkbox" name="all" onClick="collector_switchAll('SP')"></td>
<script type="text/javascript">
document.forms['SP'].elements['all'].checked = false;
</script>
<td style="width: 95px"><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SP.reOrder&by=title', 'order');" id="blue_head">##Title##</a></td> <td style="width: 95px"><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SP.reOrder&by=title', 'order');" id="blue_head">##Title##</a></td>
<td style="width: 69px"><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SP.reOrder&by=title', 'order');" id="blue_head">##Duration##</td> <td style="width: 69px"><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SP.reOrder&by=title', 'order');" id="blue_head">##Duration##</td>
<td style="width: 41px; border: 0"><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SP.reOrder&by=title', 'order');" id="blue_head">##Type##</td> <td style="width: 41px; border: 0"><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SP.reOrder&by=title', 'order');" id="blue_head">##Type##</td>
@ -41,15 +39,17 @@
<div class="footer" style="width:255px;"> <div class="footer" style="width:255px;">
<select name="SP_multiaction"> <select name="SP_multiaction">
<option>##Multiple Action:##</option> <option>##Multiple Action:##</option>
<option onClick="collector_submit('SP', 'SP.removeItem')">##Remove##</option> <option onClick="collector_submit('SP', 'SP.removeItem')">##Remove file(s)##</option>
{if $_PL_activeId} {if $_PL_activeId}
<option onClick="collector_submit('SP', 'PL.addItem')">##Add to Playlist##</option> <option onClick="collector_submit('SP', 'PL.addItem')">##Add file(s) to active Playlist##</option>
{else} {else}
<option onClick="collector_submit('SP', 'PL.create')">##New Playlist using Item##</option> <option onClick="collector_submit('SP', 'PL.create')">##New Playlist using this file(s)##</option>
{/if} {/if}
</select> </select>
<script type="text/javascript"> <script type="text/javascript">
document.forms['SP'].elements['SP_multiaction'].options[0].selected=true; document.forms['SP'].elements['SP_multiaction'].options[0].selected = true;
//document.forms['SP'].elements['all'].checked = false;
//collector_switchAll('SP');
</script> </script>
<a href="#" onClick="collector_clearAll('SP', 'SP.removeItem')" id="blue_head">##Clear##</a> <a href="#" onClick="collector_clearAll('SP', 'SP.removeItem')" id="blue_head">##Clear##</a>
</div> </div>
@ -60,62 +60,4 @@
{assign var="_PL_activeId" value=NULL} {assign var="_PL_activeId" value=NULL}
<!-- end scratch pad --> <!-- end scratch pad -->
{assign var="_PL_activeId" value=NULL}
{*
<!-- old template -->
{assign var="_PL_activeId" value=$PL->getActiveId()}
<div id="scratchpad">
<center><b>ScratchPad</b>
{if is_array($SCRATCHPAD)}
<form name="SP">
<input type="hidden" name="act">
<table>
<tr style="background-color: {cycle values='#eeeeee, #dadada'}">
<th></th>
<td align="center"><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SP.reOrder&by=title', 'order');">[Title]</a></td>
<td align="center"><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SP.reOrder&by=duration', 'order');">[Duration]</a></td>
<td align="center"><a href="#" onClick="hpopup('{$UI_HANDLER}?act=SP.reOrder&by=type', 'order');">[Type]</a></td>
<td align="center">Remove</td>
</tr>
{foreach from=$SCRATCHPAD item=i}
<tr style="background-color: {cycle values='#eeeeee, #dadada'}" {assign var="moreContextBefore" value=", 'SP.removeItem'"} {include file="sub/contextmenu.tpl"}>
<td><input type="checkbox" name="{$i.id}"></td>
<td>
{if $_PL_activeId == $i.id}
<b>{$i.title|truncate:30}</b>
{else}
{$i.title|truncate:30}
{/if}
</td>
<td>{$i.duration}</td>
<td>{$i.type} </td>
<th><a href="#" onclick="hpopup('{$UI_HANDLER}?act=SP.removeItem&id={$i.id}', 'SP')">X</th>
</tr>
{/foreach}
<tr style="background-color: {cycle values='#eeeeee, #dadada'}">
<td><input type="checkbox" name="all" onClick="collector_switchAll('SP')"></th>
<td align="center" colspan="2">
<select name="SP_multiaction">
<option>Multiple Action:</option>
<option onClick="collector_submit('SP', 'SP.removeItem')">Remove</option>
{if $_PL_activeId}
<option onClick="collector_submit('SP', 'PL.addItem')">Add to Playlist</option>
{else}
<option onClick="collector_submit('SP', 'PL.create')">New Playlist using Item</option>
{/if}
</select>
<script type="text/javascript">
document.forms['SP'].elements['SP_multiaction'].options[0].selected=true;
</script>
</th>
<td align="center" colspan="2"><a href="#" onClick="collector_clearAll('SP', 'SP.removeItem')">[Clear]</a></th>
</tr>
</table>
</form>
{/if}
</div>
</center>
*}

View file

@ -1,7 +1,6 @@
{*Smarty template*}
{literal} {literal}
<script type="text/javascript"> <script type="text/javascript">
function collector_submit(formname, action) function collector_submit(formname, action)
{ {
var href = '{/literal}{$UI_HANDLER}{literal}?act='+action; var href = '{/literal}{$UI_HANDLER}{literal}?act='+action;

View file

@ -490,16 +490,16 @@ class uiHandler extends uiBase {
return; return;
} }
if(FALSE === $this->gb->authenticate($ulogin, $oldpass)){ if(FALSE === $this->gb->authenticate($ulogin, $oldpass)){
$this->_retMsg('Wrong old pasword.'); $this->_retMsg('Old password was incorrect.');
return; return;
} }
if($pass !== $pass2){ if($pass !== $pass2){
$this->_retMsg("Passwords do not match."). $this->_retMsg("Passwords did not match.").
"($pass/$pass2)"; "($pass/$pass2)";
$this->redirUrl = UI_BROWSER.'?act=subjects'; $this->redirUrl = UI_BROWSER.'?act=subjects';
return; return;
} }
$this->_retMsg('Password changed'); $this->_retMsg('Password changed.');
$this->redirUrl = UI_BROWSER.'?act=subjects'; $this->redirUrl = UI_BROWSER.'?act=subjects';
$this->gb->passwd($ulogin, $oldpass, $pass); $this->gb->passwd($ulogin, $oldpass, $pass);
} }
@ -602,10 +602,10 @@ class uiHandler extends uiBase {
if ($val['error']) { if ($val['error']) {
switch ($val['error']) { switch ($val['error']) {
case 1: $was_error = TRUE; $this->_retMsg('Uploaded file $1 is greater than setting in php.ini.', $mask[$key]['label']); break; case 1: $was_error = TRUE; $this->_retMsg('Uploaded file $1 is bigger than setting in php.ini.', $mask[$key]['label']); break;
case 2: $was_error = TRUE; $this->_retMsg('Uploaded file $1 is greater than LiveSupport system setting.', $mask[$key]['label']); break; case 2: $was_error = TRUE; $this->_retMsg('Uploaded file $1 is bigger than LiveSupport´s system setting.', $mask[$key]['label']); break;
case 3: $was_error = TRUE; $this->_retMsg('Upload of file $1 was incomplete.', $mask[$key]['label']); break; case 3: $was_error = TRUE; $this->_retMsg('Upload of file $1 was incomplete.', $mask[$key]['label']); break;
case 4: if ($mask[$key]['required']) {$was_error = TRUE; $this->_retMsg('File $1 was not uploadet.', $mask[$key]['label']);} break; case 4: if ($mask[$key]['required']) {$was_error = TRUE; $this->_retMsg('File $1 was not uploaded.', $mask[$key]['label']);} break;
} }
} }
} }

View file

@ -48,7 +48,7 @@ class uiPlaylist
return FALSE; return FALSE;
} }
if(($userid = $this->Base->gb->playlistIsAvailable($plid, $this->Base->sessid)) !== TRUE) { if(($userid = $this->Base->gb->playlistIsAvailable($plid, $this->Base->sessid)) !== TRUE) {
if (UI_WARNING) $this->Base->_retMsg('Playlist is looked by $1', $this->Base->gb->getSubjName($userid)); if (UI_WARNING) $this->Base->_retMsg('Playlist has been locked by $1', $this->Base->gb->getSubjName($userid));
return FALSE; return FALSE;
} }
$this->token = $this->Base->gb->lockPlaylistForEdit($plid, $this->Base->sessid); $this->token = $this->Base->gb->lockPlaylistForEdit($plid, $this->Base->sessid);
@ -66,13 +66,13 @@ class uiPlaylist
# delete PL from session # delete PL from session
# remove token from ls_pref # remove token from ls_pref
if(!$this->token) { if(!$this->token) {
if (UI_WARNING) $this->Base->_retMsg('No Playlist is looked by You'); if (UI_WARNING) $this->Base->_retMsg('There is no playlist available to unlock.');
return FALSE; return FALSE;
} }
$plgunid = $this->Base->gb->releaseLockedPlaylist($this->token, $this->Base->sessid); $plgunid = $this->Base->gb->releaseLockedPlaylist($this->token, $this->Base->sessid);
if (PEAR::isError($plgunid)) { if (PEAR::isError($plgunid)) {
#print_r($plgunid); #print_r($plgunid);
if (UI_WARNING) $this->Base->_retMsg('Unable to release Playlist'); if (UI_WARNING) $this->Base->_retMsg('Unable to release Playlist.');
return FALSE; return FALSE;
} }
if ($msg && UI_VERBOSE) $this->Base->_retMsg('Playlist "$1" released', $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($plgunid), UI_MDATA_KEY_TITLE)); if ($msg && UI_VERBOSE) $this->Base->_retMsg('Playlist "$1" released', $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($plgunid), UI_MDATA_KEY_TITLE));
@ -97,13 +97,13 @@ class uiPlaylist
function revert() function revert()
{ {
if(!$this->token) { if(!$this->token) {
if (UI_WARNING) $this->Base->_retMsg('No Playlist is looked by You'); if (UI_WARNING) $this->Base->_retMsg('No Playlist is locked by You.');
return FALSE; return FALSE;
} }
$plgunid = $this->Base->gb->revertEditedPlaylist($this->token, $this->Base->sessid); $plgunid = $this->Base->gb->revertEditedPlaylist($this->token, $this->Base->sessid);
if (PEAR::isError($plgunid)) { if (PEAR::isError($plgunid)) {
# print_r($plgunid); # print_r($plgunid);
if (UI_WARNING) $this->Base->_retMsg('Unable to revert to looked state'); if (UI_WARNING) $this->Base->_retMsg('Unable to revert to locked state.');
return FALSE; return FALSE;
} }
if (UI_VERBOSE) $this->Base->_retMsg('Playlist "$1" reverted', $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($plgunid), UI_MDATA_KEY_TITLE)); if (UI_VERBOSE) $this->Base->_retMsg('Playlist "$1" reverted', $this->Base->_getMDataValue($this->Base->gb->_idFromGunid($plgunid), UI_MDATA_KEY_TITLE));
@ -120,7 +120,7 @@ class uiPlaylist
function reportLookedPL($setMsg=FALSE) function reportLookedPL($setMsg=FALSE)
{ {
if(is_string($saved = $this->Base->gb->loadPref($this->Base->sessid, UI_PL_ACCESSTOKEN_KEY))) { if(is_string($saved = $this->Base->gb->loadPref($this->Base->sessid, UI_PL_ACCESSTOKEN_KEY))) {
if ($setMsg == TRUE) $this->Base->_retMsg('Found looked Playlist'); if ($setMsg == TRUE) $this->Base->_retMsg('Found locked Playlist.');
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
@ -271,7 +271,7 @@ class uiPlaylist
#print_r($r); #print_r($r);
if (PEAR::isError($r)) { if (PEAR::isError($r)) {
if (UI_VERBOSE) print_r($r); if (UI_VERBOSE) print_r($r);
$this->Base->_retMsg('ChangeFadeInfo failed'); $this->Base->_retMsg('Change fade information failed.');
return FALSE; return FALSE;
} }
} }

View file

@ -64,24 +64,34 @@ class uiScratchPad
} }
function addItem($id) function addItem($ids)
{ {
if(!$this->Base->STATIONPREFS[UI_SCRATCHPAD_MAXLENGTH_KEY]) { if(!$this->Base->STATIONPREFS[UI_SCRATCHPAD_MAXLENGTH_KEY]) {
if (UI_WARNING) $this->Base->_retMsg('ScratchPad length is not set in System Preferences, so it cannot be used.'); if (UI_WARNING) $this->Base->_retMsg('ScratchPad length is not set in System Preferences, so it cannot be used.');
return false; return false;
} }
if (!$ids) {
$item = $this->Base->_getMetaInfo($id); if (UI_WARNING) $this->Base->_retMsg('No Item(s) selected');
$sp = $this->get(); return FALSE;
foreach ($sp as $key=>$val) {
if ($val['id'] == $item['id']) {
unset($sp[$key]);
if (UI_VERBOSE) $this->Base->_retMsg('Entry $1 was already on SP since $2.\nMoved to Top.', $item['title'], $val['added']);
} else {
#$this->Base->incAccessCounter($id);
}
} }
$sp = array_merge(array($item), is_array($sp) ? $sp : NULL); if (!is_array($ids))
$ids = array($ids);
$sp = $this->get();
foreach ($ids as $id) {
$item = $this->Base->_getMetaInfo($id);
foreach ($sp as $key=>$val) {
if ($val['id'] == $item['id']) {
unset($sp[$key]);
if (UI_VERBOSE) $this->Base->_retMsg('Entry $1 was already on the ScratchPad. It has been moved to the top of the list.', $item['title'], $val['added']);
} else {
#$this->Base->incAccessCounter($id);
}
}
$sp = array_merge(array($item), is_array($sp) ? $sp : NULL);
}
for ($n=0; $n<$this->Base->STATIONPREFS[UI_SCRATCHPAD_MAXLENGTH_KEY]; $n++) { for ($n=0; $n<$this->Base->STATIONPREFS[UI_SCRATCHPAD_MAXLENGTH_KEY]; $n++) {
if (is_array($sp[$n])) $this->items[$n] = $sp[$n]; if (is_array($sp[$n])) $this->items[$n] = $sp[$n];
} }