Index: pages/collection_public.php
===================================================================
--- pages/collection_public.php (revision 1257)
+++ pages/collection_public.php (working copy)
@@ -94,12 +94,12 @@
- >
+
\ No newline at end of file
+?>
Index: pages/team/team_content.php
===================================================================
--- pages/team/team_content.php (revision 1257)
+++ pages/team/team_content.php (working copy)
@@ -53,7 +53,7 @@
>
+
- >
+
@@ -138,4 +138,4 @@
\ No newline at end of file
+?>
Index: pages/team/team_user.php
===================================================================
--- pages/team/team_user.php (revision 1257)
+++ pages/team/team_user.php (working copy)
@@ -114,9 +114,9 @@
echo $last_active?>
&backurl=">
@@ -229,7 +229,7 @@
Index: pages/collection_manage.php
===================================================================
--- pages/collection_manage.php (revision 1257)
+++ pages/collection_manage.php (working copy)
@@ -181,36 +181,36 @@
?>
-
: >
+ > > >
- > >
+ ?search=&offset=&order_by=">
|
-&ref=&search=&offset=&order_by=&archive=&go=next"> >
+&ref=&search=&offset=&order_by=&archive=&go=next">
@@ -111,7 +111,7 @@
< search=&offset=&order_by=&archive=&k="> > ?search=&offset=&order_by=">
|
- >
+>
+>
+>
+>
+
@@ -332,20 +374,29 @@
# Batch uploads (SWF/Java) - also ask which collection to add the resource to.
if ($enable_add_collection_on_upload)
{
+ $new_collection_selected = '';
+ $selected_text = 'selected';
+ if ( $collection_add == -1 )
+ $new_collection_selected = $selected_text;
+
?>
-
- ()
+
+ >()
">
+ " >
+
+
+
+
@@ -372,6 +431,7 @@
+
*
+
Index: pages/done.php
===================================================================
--- pages/done.php (revision 1257)
+++ pages/done.php (working copy)
@@ -17,14 +17,14 @@
- >
- >
+
+
- >
+
\ No newline at end of file
+?>
Index: pages/upload_java.php
===================================================================
--- pages/upload_java.php (revision 1257)
+++ pages/upload_java.php (working copy)
@@ -8,6 +8,7 @@
include "../include/collections_functions.php";
$status="";
$resource_type=getvalescaped("resource_type","");
+// This is where the collection id is passed into this script
$collection_add=getvalescaped("collection_add","");
$allowed_extensions="";
@@ -21,9 +22,15 @@
# The user has chosen Create New Collection from the dropdown.
$collection_add=create_collection($userref,$lang["upload"] . " " . date("ymdHis"));
set_user_collection($userref,$collection_add);
- refresh_collection_frame($collection_add);
}
+// refresh the bottom pane to make sure have current collection being
+// uploaded into! Its important!!!
+if ( empty($collection_add) )
+ refresh_collection_frame('', false);
+else
+ refresh_collection_frame($collection_add, false);
+
#handle posts
if (array_key_exists("File0",$_FILES))
{
Index: pages/upload_preview.php
===================================================================
--- pages/upload_preview.php (revision 1257)
+++ pages/upload_preview.php (working copy)
@@ -52,7 +52,7 @@
>
+
Index: pages/help.php
===================================================================
--- pages/help.php (revision 1257)
+++ pages/help.php (working copy)
@@ -33,10 +33,10 @@
- >
+
\ No newline at end of file
+?>
Index: pages/download_progress.php
===================================================================
--- pages/download_progress.php (revision 1257)
+++ pages/download_progress.php (working copy)
@@ -38,21 +38,21 @@
>
+
- &offset=&order_by=&archive=">>
+ &offset=&order_by=&archive=">
- >
- >
+
+
\ No newline at end of file
+?>
Index: pages/ajax/collections_frameless_loader.php
===================================================================
--- pages/ajax/collections_frameless_loader.php (revision 1257)
+++ pages/ajax/collections_frameless_loader.php (working copy)
@@ -124,28 +124,28 @@
Index: pages/download_click.php
===================================================================
--- pages/download_click.php (revision 1257)
+++ pages/download_click.php (working copy)
@@ -12,15 +12,15 @@
- >
+
- >
- >
+
+
\ No newline at end of file
+?>
Index: pages/collections.php
===================================================================
--- pages/collections.php (revision 1257)
+++ pages/collections.php (working copy)
@@ -23,10 +23,27 @@
<?php echo $applicationname?>
->
+ >
- >
+ > > > > > > " target="main">> > " target="main"> " target="main">> " target="main"> > > > >
+
Index: pages/themes.php
===================================================================
--- pages/themes.php (revision 1257)
+++ pages/themes.php (working copy)
@@ -173,7 +173,7 @@
?>
" title="">>
+
Index: pages/home.php
===================================================================
--- pages/home.php (revision 1257)
+++ pages/home.php (working copy)
@@ -87,7 +87,7 @@
for ($n=0;$n
- >
+
@@ -177,4 +177,4 @@
} // End of ReplaceHome hook
include "../include/footer.php";
-?>
\ No newline at end of file
+?>
Index: include/searchbar.php
===================================================================
--- include/searchbar.php (revision 1257)
+++ include/searchbar.php (working copy)
@@ -66,8 +66,8 @@
- >
- >
+
+
@@ -330,8 +330,8 @@
- >
- ">>
+
+ ">
@@ -345,7 +345,7 @@
-
+
-
>
+
style="display:block;">
@@ -47,4 +47,4 @@
-
\ No newline at end of file
+
Index: include/footer.php
===================================================================
--- include/footer.php (revision 1257)
+++ include/footer.php (working copy)
@@ -73,7 +73,7 @@
-
+
@@ -107,8 +107,8 @@
< 1) { ?> | | >
+ < 1) { ?> | |
:
true if a valid URL or
+ * false if invalid
+ */
+function validate_url ($url)
+{
+ return eregi("^(http|https|ftp)+(:\/\/)+[a-z0-9_-]+\.+[a-z0-9_-]", $url );
+}
+
+/**
+ * Checks if an email address is valid.
+ *
+ * @param $email email address string
+ * @return true if a valid email address or
+ * false if invalid
+ */
+function validate_email ($email)
+{
+ return eregi("^[_a-z0-9-]+(.[_a-z0-9-]+)*@[a-z0-9-]+(.[a-z0-9-]+)*(.[a-z]{2,3})$", $email);
+}
+
+/**
+ * Prints an alert in a red box. It is dependent on the style sheet defining a
+ * nice box.
+ *
+ * @param $message string A message to be printed.
+ */
+function print_alert ($message)
+{
+ echo '' . $message . '
';
+}
+
+/**
+ * Prints a nice message box. It is dependent on the style sheet where this is
+ * printed.
+ *
+ * @param $message string A message to be printed.
+ */
+function print_message ($message)
+{
+ echo '' . $message . '
';
+}
+
+/**
+ * Prints a list of alerts.
+ *
+ * @param &$array array An array of strings for printing out grouping of alert.
+ */
+function print_alert_from_array (&$array)
+{
+ // don't waste time if there is nothing in this bitch
+ if ( count($array) < 1 )
+ return;
+
+ echo '';
+ foreach ($array as $item)
+ echo "$item \n";
+ echo ' ';
+}
+?>
Index: include/header.php
===================================================================
--- include/header.php (revision 1257)
+++ include/header.php (working copy)
@@ -10,10 +10,27 @@
<?php echo htmlspecialchars($applicationname)?>
- 