-
+
+
diff --git a/admin/users.php b/admin/users.php
index b87f1bb5bc8..4a83510cb72 100644
--- a/admin/users.php
+++ b/admin/users.php
@@ -28,8 +28,11 @@ if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' ))
}
// We have some javascript foo!
-OC_Util::addScript( "admin", "users" );
-OC_App::setActiveNavigationEntry( "core_users" );
+OC_Util::addScript( 'admin', 'users' );
+OC_Util::addStyle( 'admin', 'users' );
+OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' );
+OC_Util::addStyle( '3rdparty', 'chosen' );
+OC_App::setActiveNavigationEntry( 'core_users' );
$users = array();
$groups = array();
@@ -48,7 +51,7 @@ foreach( OC_Group::getGroups() as $i ){
$groups[] = array( "name" => $i );
}
-$tmpl = new OC_Template( "admin", "users", "admin" );
+$tmpl = new OC_Template( "admin", "users", "user" );
$tmpl->assign( "users", $users );
$tmpl->assign( "groups", $groups );
$tmpl->printPage();
diff --git a/apps/contacts/ajax/addcard.php b/apps/contacts/ajax/addcard.php
new file mode 100644
index 00000000000..24766931d71
--- /dev/null
+++ b/apps/contacts/ajax/addcard.php
@@ -0,0 +1,54 @@
+.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+
+$aid = $_POST['id'];
+$l10n = new OC_L10N('contacts');
+
+// Check if we are a user
+if( !OC_User::isLoggedIn()){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in!'))));
+ exit();
+}
+
+$addressbook = OC_Contacts_Addressbook::findAddressbook( $aid );
+if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your addressbook!'))));
+ exit();
+}
+
+$fn = $_POST['fn'];
+
+$vcard = new Sabre_VObject_Component('VCARD');
+$vcard->add(new Sabre_VObject_Property('FN',$fn));
+$vcard->add(new Sabre_VObject_Property('UID',OC_Contacts_Addressbook::createUID()));
+$id = OC_Contacts_Addressbook::addCard($aid,$vcard->serialize());
+
+$details = OC_Contacts_Addressbook::structureContact($vcard);
+$tmpl = new OC_Template('contacts','part.details');
+$tmpl->assign('details',$details);
+$tmpl->assign('id',$id);
+$page = $tmpl->fetchPage();
+
+echo json_encode( array( 'status' => 'success', 'data' => array( 'id' => $id, 'page' => $page )));
diff --git a/apps/contacts/ajax/addphoto.php b/apps/contacts/ajax/addphoto.php
new file mode 100644
index 00000000000..03d5e6b3ceb
--- /dev/null
+++ b/apps/contacts/ajax/addphoto.php
@@ -0,0 +1,59 @@
+.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+
+$id = $_POST['id'];
+$l10n = new OC_L10N('contacts');
+
+// Check if we are a user
+if( !OC_User::isLoggedIn()){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in!'))));
+ exit();
+}
+
+$card = OC_Contacts_Addressbook::findCard( $id );
+if( $card === false ){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Can not find Contact!'))));
+ exit();
+}
+
+$addressbook = OC_Contacts_Addressbook::findAddressbook( $card['addressbookid'] );
+if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your contact!'))));
+ exit();
+}
+
+$vcard = Sabre_VObject_Reader::read($card['carddata']);
+$mimetype = $_FILES['photo']['type'] ? $_FILES['photo']['type'] : 'image/jpeg';
+$photobase = base64_encode(file_get_contents($_FILES['photo']['tmp_name']));
+$photo = new Sabre_VObject_Property( 'PHOTO', $photobase );
+$photo->parameters[] = new Sabre_VObject_Parameter('TYPE',$mimetype);
+$photo->parameters[] = new Sabre_VObject_Parameter('ENCODING','b');
+$vcard->add($photo);
+
+$line = count($vcard->children) - 1;
+$checksum = md5($vcard->children[$line]->serialize());
+
+OC_Contacts_Addressbook::editCard($id,$vcard->serialize());
+echo json_encode( array( 'status' => 'success', 'data' => array( 'id' => $id, 'line' => $line, 'checksum' => $checksum )));
diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
new file mode 100644
index 00000000000..d92566d6a18
--- /dev/null
+++ b/apps/contacts/ajax/addproperty.php
@@ -0,0 +1,73 @@
+.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+
+$id = $_POST['id'];
+$l10n = new OC_L10N('contacts');
+
+// Check if we are a user
+if( !OC_User::isLoggedIn()){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in!'))));
+ exit();
+}
+
+$card = OC_Contacts_Addressbook::findCard( $id );
+if( $card === false ){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Can not find Contact!'))));
+ exit();
+}
+
+$addressbook = OC_Contacts_Addressbook::findAddressbook( $card['addressbookid'] );
+if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your contact!'))));
+ exit();
+}
+
+$vcard = Sabre_VObject_Reader::read($card['carddata']);
+
+$name = $_POST['name'];
+$value = $_POST['value'];
+$parameters = isset($_POST['parameteres'])?$_POST['parameters']:array();
+
+if(is_array($value)){
+ $value = OC_Contacts_Addressbook::escapeSemicolons($value);
+}
+$property = new Sabre_VObject_Property( $name, $value );
+$parameternames = array_keys($parameters);
+foreach($parameternames as $i){
+ $property->parameters[] = new Sabre_VObject_Parameter($i,$parameters[$i]);
+}
+
+$vcard->add($property);
+
+$line = count($vcard->children) - 1;
+$checksum = md5($property->serialize());
+
+OC_Contacts_Addressbook::editCard($id,$vcard->serialize());
+
+$tmpl = new OC_Template('contacts','part.property');
+$tmpl->assign('property',OC_Contacts_Addressbook::structureProperty($property,$line));
+$page = $tmpl->fetchPage();
+
+echo json_encode( array( 'status' => 'success', 'data' => array( 'page' => $page )));
diff --git a/apps/contacts/ajax/deletebook.php b/apps/contacts/ajax/deletebook.php
new file mode 100644
index 00000000000..ba36c494cdf
--- /dev/null
+++ b/apps/contacts/ajax/deletebook.php
@@ -0,0 +1,44 @@
+.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+
+$id = $_GET['id'];
+
+$l10n = new OC_L10N('contacts');
+
+// Check if we are a user
+if( !OC_User::isLoggedIn()){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in!'))));
+ exit();
+}
+
+
+$addressbook = OC_Contacts_Addressbook::findAddressbook( $id );
+if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your contact!'))));
+ exit();
+}
+
+OC_Contacts_Addressbook::deleteAddressbook($id);
+echo json_encode( array( 'status' => 'success', 'data' => array( 'id' => $id )));
diff --git a/apps/contacts/ajax/deletecard.php b/apps/contacts/ajax/deletecard.php
new file mode 100644
index 00000000000..839936d3fad
--- /dev/null
+++ b/apps/contacts/ajax/deletecard.php
@@ -0,0 +1,50 @@
+.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+
+$id = $_GET['id'];
+
+$l10n = new OC_L10N('contacts');
+
+// Check if we are a user
+if( !OC_User::isLoggedIn()){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in!'))));
+ exit();
+}
+
+
+$card = OC_Contacts_Addressbook::findCard( $id );
+if( $card === false ){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Can not find Contact!'))));
+ exit();
+}
+
+$addressbook = OC_Contacts_Addressbook::findAddressbook( $card['addressbookid'] );
+if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your contact!'))));
+ exit();
+}
+
+OC_Contacts_Addressbook::deleteCard($id);
+echo json_encode( array( 'status' => 'success', 'data' => array( 'id' => $id )));
diff --git a/apps/contacts/ajax/deleteproperty.php b/apps/contacts/ajax/deleteproperty.php
new file mode 100644
index 00000000000..9f8b5dbbaf1
--- /dev/null
+++ b/apps/contacts/ajax/deleteproperty.php
@@ -0,0 +1,62 @@
+.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+
+$id = $_GET['id'];
+$line = $_GET['line'];
+$checksum = $_GET['checksum'];
+
+
+$l10n = new OC_L10N('contacts');
+
+// Check if we are a user
+if( !OC_User::isLoggedIn()){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in!'))));
+ exit();
+}
+
+
+$card = OC_Contacts_Addressbook::findCard( $id );
+if( $card === false ){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Can not find Contact!'))));
+ exit();
+}
+
+$addressbook = OC_Contacts_Addressbook::findAddressbook( $card['addressbookid'] );
+if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your contact!'))));
+ exit();
+}
+
+$vcard = Sabre_VObject_Reader::read($card['carddata']);
+
+if(md5($vcard->children[$line]->serialize()) != $checksum ){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Information about vCard is incorrect. Please reload page!'))));
+ exit();
+}
+
+unset($vcard->children[$line]);
+
+OC_Contacts_Addressbook::editCard($id,$vcard->serialize());
+echo json_encode( array( 'status' => 'success', 'data' => array( 'id' => $id )));
diff --git a/apps/contacts/details.php b/apps/contacts/ajax/getdetails.php
similarity index 87%
rename from apps/contacts/details.php
rename to apps/contacts/ajax/getdetails.php
index 7ab1b64de24..4ee3625afc2 100644
--- a/apps/contacts/details.php
+++ b/apps/contacts/ajax/getdetails.php
@@ -21,7 +21,7 @@
*/
// Init owncloud
-require_once('../../lib/base.php');
+require_once('../../../lib/base.php');
$id = $_GET['id'];
@@ -29,7 +29,7 @@ $l10n = new OC_L10N('contacts');
// Check if we are a user
if( !OC_User::isLoggedIn()){
- echo $l10n->t('You need to log in!');
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in!'))));
exit();
}
@@ -48,10 +48,9 @@ if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
$vcard = Sabre_VObject_Reader::read($card['carddata']);
$details = OC_Contacts_Addressbook::structureContact($vcard);
-
-$tmpl = new OC_Template('contacts','_details');
+$tmpl = new OC_Template('contacts','part.details');
$tmpl->assign('details',$details);
$tmpl->assign('id',$id);
$page = $tmpl->fetchPage();
-echo json_encode( array( 'status' => 'success', 'data' => array( 'page' => $page )));
+echo json_encode( array( 'status' => 'success', 'data' => array( 'id' => $id, 'page' => $page )));
diff --git a/apps/contacts/ajax/setphoto.php b/apps/contacts/ajax/setphoto.php
new file mode 100644
index 00000000000..c29b5326027
--- /dev/null
+++ b/apps/contacts/ajax/setphoto.php
@@ -0,0 +1,77 @@
+.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+
+$id = $_POST['id'];
+$line = $_POST['line'];
+$checksum = $_POST['checksum'];
+$l10n = new OC_L10N('contacts');
+
+// Check if we are a user
+if( !OC_User::isLoggedIn()){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in!'))));
+ exit();
+}
+
+$card = OC_Contacts_Addressbook::findCard( $id );
+if( $card === false ){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Can not find Contact!'))));
+ exit();
+}
+
+$addressbook = OC_Contacts_Addressbook::findAddressbook( $card['addressbookid'] );
+if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your contact!'))));
+ exit();
+}
+
+$vcard = Sabre_VObject_Reader::read($card['carddata']);
+$mimetype = $_FILES['photo']['type'] ? $_FILES['photo']['type'] : 'image/jpeg';
+$photobase = base64_encode(file_get_contents($_FILES['photo']['tmp_name']));
+
+if(md5($vcard->children[$line]->serialize()) != $checksum){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Information about vCard is incorrect. Please reload page!'))));
+ exit();
+}
+
+// replace photo
+$vcard->children[$line]->setValue($photobase);
+$encoding = $type = false;
+foreach($vcard->children[$line]->parameters as &$parameter){
+ if($parameter->name == 'TYPE'){
+ $parameter->value = $mimetype;
+ $type = true;
+ }
+ elseif($parameter->name == 'ENCODING'){
+ $parameter->value = 'b';
+ $encoding = true;
+ }
+} unset($parameter);
+if(!$encoding) $vcard->children[$line]->parameters[] = new Sabre_VObject_Parameter('ENCODING','b');
+if(!$type) $vcard->children[$line]->parameters[] = new Sabre_VObject_Parameter('TYPE',$mimetype);
+
+$checksum = md5($vcard->children[$line]->serialize());
+
+OC_Contacts_Addressbook::editCard($id,$vcard->serialize());
+echo json_encode( array( 'status' => 'success', 'data' => array( 'id' => $id, 'line' => $line, 'checksum' => $checksum )));
diff --git a/apps/contacts/ajax/setproperty.php b/apps/contacts/ajax/setproperty.php
new file mode 100644
index 00000000000..6f33c68631a
--- /dev/null
+++ b/apps/contacts/ajax/setproperty.php
@@ -0,0 +1,93 @@
+.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+
+$id = $_POST['id'];
+$line = $_POST['line'];
+$checksum = $_POST['checksum'];
+$l10n = new OC_L10N('contacts');
+
+// Check if we are a user
+if( !OC_User::isLoggedIn()){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in!'))));
+ exit();
+}
+
+$card = OC_Contacts_Addressbook::findCard( $id );
+if( $card === false ){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Can not find Contact!'))));
+ exit();
+}
+
+$addressbook = OC_Contacts_Addressbook::findAddressbook( $card['addressbookid'] );
+if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your contact!'))));
+ exit();
+}
+
+$vcard = Sabre_VObject_Reader::read($card['carddata']);
+
+if(md5($vcard->children[$line]->serialize()) != $checksum){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Information about vCard is incorrect. Please reload page!'))));
+ exit();
+}
+
+// Set the value
+$value = $_POST['value'];
+if(is_array($value)){
+ $value = OC_Contacts_Addressbook::escapeSemicolons($value);
+}
+$vcard->children[$line]->setValue($value);
+
+// Add parameters
+$postparameters = isset($_POST['parameters'])?$_POST['parameters']:array();
+for($i=0;$i
children[$line]->parameters);$i++){
+ $name = $vcard->children[$line]->parameters[$i]->name;
+ if(array_key_exists($name,$postparameters)){
+ if($postparameters[$name] == '' || is_null($postparameters[$name])){
+ unset($vcard->children[$line]->parameters[$i]);
+ }
+ else{
+ $vcard->children[$line]->parameters[$i]->value = $postparameters[$name];
+ }
+ unset($postparameters[$name]);
+ }
+}
+$missingparameters = array_keys($postparameters);
+foreach($missingparameters as $i){
+ if(!$postparameters[$i] == '' && !is_null($postparameters[$i])){
+ $vcard->children[$line]->parameters[] = new Sabre_VObject_Parameter($i,$postparameters[$i]);
+ }
+}
+
+// Do checksum and be happy
+$checksum = md5($vcard->children[$line]->serialize());
+
+OC_Contacts_Addressbook::editCard($id,$vcard->serialize());
+
+$tmpl = new OC_Template('contacts','part.property');
+$tmpl->assign('property',OC_Contacts_Addressbook::structureProperty($vcard->children[$line],$line));
+$page = $tmpl->fetchPage();
+
+echo json_encode( array( 'status' => 'success', 'data' => array( 'page' => $page, 'line' => $line, 'oldchecksum' => $_POST['checksum'] )));
diff --git a/apps/contacts/ajax/showaddcard.php b/apps/contacts/ajax/showaddcard.php
new file mode 100644
index 00000000000..41ebb41d3e9
--- /dev/null
+++ b/apps/contacts/ajax/showaddcard.php
@@ -0,0 +1,39 @@
+.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+
+$l10n = new OC_L10N('contacts');
+
+// Check if we are a user
+if( !OC_User::isLoggedIn()){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in!'))));
+ exit();
+}
+
+$addressbooks = OC_Contacts_Addressbook::allAddressbooks(OC_USER::getUser());
+$tmpl = new OC_Template('contacts','part.addcardform');
+$tmpl->assign('addressbooks',$addressbooks);
+$page = $tmpl->fetchPage();
+
+echo json_encode( array( 'status' => 'success', 'data' => array( 'page' => $page )));
diff --git a/apps/contacts/ajax/showaddproperty.php b/apps/contacts/ajax/showaddproperty.php
new file mode 100644
index 00000000000..becc39b120a
--- /dev/null
+++ b/apps/contacts/ajax/showaddproperty.php
@@ -0,0 +1,51 @@
+.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+
+$id = $_GET['id'];
+$l10n = new OC_L10N('contacts');
+
+// Check if we are a user
+if( !OC_User::isLoggedIn()){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in!'))));
+ exit();
+}
+
+$card = OC_Contacts_Addressbook::findCard( $id );
+if( $card === false ){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Can not find Contact!'))));
+ exit();
+}
+
+$addressbook = OC_Contacts_Addressbook::findAddressbook( $card['addressbookid'] );
+if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your contact!'))));
+ exit();
+}
+
+$tmpl = new OC_Template('contacts','part.addpropertyform');
+$tmpl->assign('id',$id);
+$page = $tmpl->fetchPage();
+
+echo json_encode( array( 'status' => 'success', 'data' => array( 'page' => $page )));
diff --git a/apps/contacts/ajax/showsetproperty.php b/apps/contacts/ajax/showsetproperty.php
new file mode 100644
index 00000000000..75c3ff88f5f
--- /dev/null
+++ b/apps/contacts/ajax/showsetproperty.php
@@ -0,0 +1,62 @@
+.
+ *
+ */
+
+// Init owncloud
+require_once('../../../lib/base.php');
+
+$id = $_GET['id'];
+$line = $_GET['line'];
+$checksum = $_GET['checksum'];
+$l10n = new OC_L10N('contacts');
+
+// Check if we are a user
+if( !OC_User::isLoggedIn()){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('You need to log in!'))));
+ exit();
+}
+
+$card = OC_Contacts_Addressbook::findCard( $id );
+if( $card === false ){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Can not find Contact!'))));
+ exit();
+}
+
+$addressbook = OC_Contacts_Addressbook::findAddressbook( $card['addressbookid'] );
+if( $addressbook === false || $addressbook['userid'] != OC_USER::getUser()){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('This is not your contact!'))));
+ exit();
+}
+
+$vcard = Sabre_VObject_Reader::read($card['carddata']);
+if(md5($vcard->children[$line]->serialize()) != $checksum){
+ echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => $l10n->t('Information about vCard is incorrect. Please reload page!'))));
+ exit();
+}
+
+
+$tmpl = new OC_Template('contacts','part.setpropertyform');
+$tmpl->assign('id',$id);
+$tmpl->assign('checksum',$checksum);
+$tmpl->assign('property',OC_Contacts_Addressbook::structureProperty($vcard->children[$line],$line));
+$page = $tmpl->fetchPage();
+
+echo json_encode( array( 'status' => 'success', 'data' => array( 'page' => $page )));
diff --git a/apps/contacts/carddav.php b/apps/contacts/carddav.php
index ae2c5b97363..581bf4a717b 100644
--- a/apps/contacts/carddav.php
+++ b/apps/contacts/carddav.php
@@ -1,4 +1,24 @@
.
+ *
+ */
// Do not load FS ...
$RUNTIME_NOSETUPFS = true;
diff --git a/apps/contacts/css/styles.css b/apps/contacts/css/styles.css
index 8d1c8b69c3f..c7680f4a716 100644
--- a/apps/contacts/css/styles.css
+++ b/apps/contacts/css/styles.css
@@ -1 +1 @@
-
+.contacts_propertyname {float:left;}
diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index 1e01b1c9fbd..0d4ff83ef81 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -37,6 +37,12 @@ if( !OC_User::isLoggedIn()){
$addressbooks = OC_Contacts_Addressbook::allAddressbooks(OC_User::getUser());
if( count($addressbooks) == 0){
OC_Contacts_Addressbook::addAddressbook(OC_User::getUser(),'default','Default Address Book');
+ $addressbooks = OC_Contacts_Addressbook::allAddressbooks(OC_User::getUser());
+}
+$prefbooks = OC_Preferences::getValue(OC_User::getUser(),'contacts','openaddressbooks',null);
+if(is_null($prefbooks)){
+ $prefbooks = $addressbooks[0]['id'];
+ OC_Preferences::setValue(OC_User::getUser(),'contacts','openaddressbooks',$prefbooks);
}
// Load the files we need
@@ -48,7 +54,7 @@ $id = isset( $_GET['id'] ) ? $_GET['id'] : null;
// sort addressbooks (use contactsort)
usort($addressbooks,'contacts_namesort');
// Addressbooks to load
-$openaddressbooks = explode(';',OC_Preferences::getValue(OC_User::getUser(),'contacts','openaddressbooks',null));
+$openaddressbooks = explode(';',$prefbooks);
$contacts = array();
foreach( $openaddressbooks as $addressbook ){
@@ -63,7 +69,8 @@ usort($contacts,'contacts_namesort');
$details = array();
if( !is_null($id) || count($contacts)){
- $contact = OC_Contacts_Addressbook::findCard(is_null($id)?$contacts[0]['id']:$id);
+ if(is_null($id)) $id = $contacts[0]['id'];
+ $contact = OC_Contacts_Addressbook::findCard($id);
$vcard = Sabre_VObject_Reader::read($contact['carddata']);
$details = OC_Contacts_Addressbook::structureContact($vcard);
}
diff --git a/apps/contacts/js/interface.js b/apps/contacts/js/interface.js
index 6af160b3927..0aae7d15d45 100644
--- a/apps/contacts/js/interface.js
+++ b/apps/contacts/js/interface.js
@@ -1,9 +1,15 @@
$(document).ready(function(){
- $('.contacts_contacts').find('li').live('click',function(){
+ /* $('.contacts_addressbooksexpander').click(function(){
+ $('.contacts_addressbooksdetails').toggle();
+ return false;
+ });*/
+
+ $('#contacts_contacts li').live('click',function(){
var id = $(this).attr('x-id');
- $.getJSON('details.php',{'id':id},function(jsondata){
+ $.getJSON('ajax/getdetails.php',{'id':id},function(jsondata){
if(jsondata.status == 'success'){
- $('.contacts_details').html(jsondata.data.page);
+ $('#contacts_details').attr('x-id',jsondata.data.id);
+ $('#contacts_details').html(jsondata.data.page);
}
else{
alert(jsondata.data.message);
@@ -12,8 +18,140 @@ $(document).ready(function(){
return false;
});
- $('.contacts_addressbooksexpander').click(function(){
- $('.contacts_addressbooksdetails').toggle();
+ $('#contacts_deletecard').live('click',function(){
+ var id = $('#contacts_details').attr('x-id');
+ $.getJSON('ajax/deletecard.php',{'id':id},function(jsondata){
+ if(jsondata.status == 'success'){
+ $('#contacts_contacts [x-id="'+jsondata.data.id+'"]').remove();
+ $('#contacts_details').attr('x-id','');
+ $('#contacts_details').html('');
+ }
+ else{
+ alert(jsondata.data.message);
+ }
+ });
+ return false;
+ });
+
+ $('#contacts_addproperty').live('click',function(){
+ var id = $('#contacts_details').attr('x-id');
+ $.getJSON('ajax/showaddproperty.php',{'id':id},function(jsondata){
+ if(jsondata.status == 'success'){
+ $('#contacts_details').append(jsondata.data.page);
+ }
+ else{
+ alert(jsondata.data.message);
+ }
+ });
return false;
});
+
+ $('#contacts_addpropertyform [name="name"]').live('change',function(){
+ $('#contacts_addpropertyform #contacts_addresspart').remove();
+ $('#contacts_addpropertyform #contacts_phonepart').remove();
+ $('#contacts_addpropertyform #contacts_fieldpart').remove();
+ $('#contacts_addpropertyform #contacts_generic').remove();
+ if($(this).val() == 'ADR'){
+ $('#contacts_addresspart').clone().insertBefore($('#contacts_addpropertyform input[type="submit"]'));
+ }
+ else if($(this).val() == 'TEL'){
+ $('#contacts_phonepart').clone().insertBefore($('#contacts_addpropertyform input[type="submit"]'));
+ }
+ else if($(this).val() == 'NOTE'){
+ $('#contacts_fieldpart').clone().insertBefore($('#contacts_addpropertyform input[type="submit"]'));
+ }
+ else{
+ $('#contacts_generic').clone().insertBefore($('#contacts_addpropertyform input[type="submit"]'));
+ }
+ });
+
+ $('#contacts_addpropertyform input[type="submit"]').live('click',function(){
+ $.post('ajax/addproperty.php',$('#contacts_addpropertyform').serialize(),function(jsondata){
+ if(jsondata.status == 'success'){
+ $('#contacts_details').append(jsondata.data.page);
+ $('#contacts_addpropertyform').remove();
+ }
+ else{
+ alert(jsondata.data.message);
+ }
+ }, 'json');
+ return false;
+ });
+
+ $('#contacts_newcontact').click(function(){
+ $.getJSON('ajax/showaddcard.php',{},function(jsondata){
+ if(jsondata.status == 'success'){
+ $('#contacts_details').attr('x-id','');
+ $('#contacts_details').html(jsondata.data.page);
+ }
+ else{
+ alert(jsondata.data.message);
+ }
+ });
+ return false;
+ });
+
+ $('#contacts_addcardform input[type="submit"]').live('click',function(){
+ $.post('ajax/addcard.php',$('#contacts_addcardform').serialize(),function(jsondata){
+ if(jsondata.status == 'success'){
+ $('#contacts_details').attr('x-id',jsondata.data.id);
+ $('#contacts_details').html(jsondata.data.page);
+ }
+ else{
+ alert(jsondata.data.message);
+ }
+ }, 'json');
+ return false;
+ });
+
+ $('.contacts_property [x-use="edit"]').live('click',function(){
+ var id = $('#contacts_details').attr('x-id');
+ var checksum = $(this).parent().parent().attr('x-checksum');
+ var line = $(this).parent().parent().attr('x-line');
+ $.getJSON('ajax/showsetproperty.php',{'id': id, 'checksum': checksum, 'line': line },function(jsondata){
+ if(jsondata.status == 'success'){
+ $('.contacts_property[x-line="'+line+'"][x-checksum="'+checksum+'"] .contacts_propertyvalue').html(jsondata.data.page);
+ }
+ else{
+ alert(jsondata.data.message);
+ }
+ });
+ return false;
+ });
+
+ $('#contacts_setpropertyform input[type="submit"]').live('click',function(){
+ $.post('ajax/setproperty.php',$('#contacts_setpropertyform').serialize(),function(jsondata){
+ if(jsondata.status == 'success'){
+ $('.contacts_property[x-line="'+jsondata.data.line+'"][x-checksum="'+jsondata.data.oldchecksum+'"]').replaceWith(jsondata.data.page);
+ }
+ else{
+ alert(jsondata.data.message);
+ }
+ },'json');
+ return false;
+ });
+
+ $('.contacts_property [x-use="delete"]').live('click',function(){
+ var id = $('#contacts_details').attr('x-id');
+ var checksum = $(this).parent().parent().attr('x-checksum');
+ var line = $(this).parent().parent().attr('x-line');
+ $.getJSON('ajax/deleteproperty.php',{'id': id, 'checksum': checksum, 'line': line },function(jsondata){
+ if(jsondata.status == 'success'){
+ $('.contacts_property[x-line="'+line+'"][x-checksum="'+checksum+'"]').remove();
+ }
+ else{
+ alert(jsondata.data.message);
+ }
+ });
+ return false;
+ });
+
+
+ $('.contacts_property').live('mouseenter',function(){
+ $(this).find('span').show();
+ });
+
+ $('.contacts_property').live('mouseleave',function(){
+ $(this).find('span').hide();
+ });
});
diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index c0f26c7df55..cb7b0b4671a 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -78,7 +78,7 @@ class OC_Contacts_Addressbook{
$uris[] = $i['uri'];
}
- $uri = self::createURI('name', $uris );
+ $uri = self::createURI($name, $uris );
$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*contacts_addressbooks (userid,displayname,uri,description,ctag) VALUES(?,?,?,?,?)' );
$result = $stmt->execute(array($userid,$name,$uri,$description,1));
@@ -167,14 +167,14 @@ class OC_Contacts_Addressbook{
$uri = $property->value.'.vcf';
}
}
- $uri = self::createUID().'.vcf';
+ if(is_null($uri)) $uri = self::createUID().'.vcf';
$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*contacts_cards (addressbookid,fullname,carddata,uri,lastmodified) VALUES(?,?,?,?,?)' );
$result = $stmt->execute(array($id,$fn,$data,$uri,time()));
- self::touch($id);
+ self::touchAddressbook($id);
- return OC_DB::insertid;
+ return OC_DB::insertid();
}
public static function addCardFromDAVData($id,$uri,$data){
@@ -189,13 +189,13 @@ class OC_Contacts_Addressbook{
$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*contacts_cards (addressbookid,fullname,carddata,uri,lastmodified) VALUES(?,?,?,?,?)' );
$result = $stmt->execute(array($id,$fn,$data,$uri,time()));
- self::touch($id);
+ self::touchAddressbook($id);
- return OC_DB::insertid;
+ return OC_DB::insertid();
}
public static function editCard($id, $data){
- $oldcard = self::findCard($id,$aid,$uri);
+ $oldcard = self::findCard($id);
$fn = null;
$card = Sabre_VObject_Reader::read($data);
foreach($card->children as $property){
@@ -207,7 +207,7 @@ class OC_Contacts_Addressbook{
$stmt = OC_DB::prepare( 'UPDATE *PREFIX*contacts_cards SET fullname = ?,carddata = ?, lastmodified = ? WHERE id = ?' );
$result = $stmt->execute(array($fn,$data,time(),$id));
- self::touch($oldcard['addressbookid']);
+ self::touchAddressbook($oldcard['addressbookid']);
return true;
}
@@ -226,20 +226,20 @@ class OC_Contacts_Addressbook{
$stmt = OC_DB::prepare( 'UPDATE *PREFIX*contacts_cards SET fullname = ?,carddata = ?, lastmodified = ? WHERE id = ?' );
$result = $stmt->execute(array($fn,$data,time(),$oldcard['id']));
- self::touch($oldcard['addressbookid']);
+ self::touchAddressbook($oldcard['addressbookid']);
return true;
}
public static function deleteCard($id){
- $stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*contacts_addressbooks WHERE id = ?' );
+ $stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*contacts_cards WHERE id = ?' );
$stmt->execute(array($id));
return true;
}
public static function deleteCardFromDAVData($aid,$uri){
- $stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*contacts_addressbooks WHERE addressbookid = ? AND uri=?' );
+ $stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*contacts_cards WHERE addressbookid = ? AND uri=?' );
$stmt->execute(array($aid,$uri));
return true;
@@ -265,23 +265,60 @@ class OC_Contacts_Addressbook{
return $userid;
}
+ public static function escapeSemicolons($value){
+ foreach($value as &$i ){
+ $i = implode("\\\\;", explode(';', $i));
+ } unset($i);
+ return implode(';',$value);
+ }
+
+ public static function unescapeSemicolons($value){
+ $array = explode(';',$value);
+ for($i=0;$ichildren as $property){
- $temp = array(
- 'name' => $property->name,
- 'value' => ($property->name == 'PHOTO' || $property->name == 'LOGO' ? null : $property->value ),
- 'parameters' => array());
- foreach($property->parameters as $parameter){
- $temp['parameters'][] = array( 'name' => $parameter->name, 'value' => $parameter->value);
- }
+ $temp = self::structureProperty($property,$line);
if(array_key_exists($property->name,$details)){
$details[$property->name][] = $temp;
}
else{
$details[$property->name] = array($temp);
}
+ $line++;
}
return $details;
}
+
+ public static function structureProperty($property,$line=null){
+ $value = $property->value;
+ if($property->name == 'ADR'){
+ $value = self::unescapeSemicolons($value);
+ }
+ $temp = array(
+ 'name' => $property->name,
+ 'value' => $value,
+ 'line' => $line,
+ 'parameters' => array(),
+ 'checksum' => md5($property->serialize()));
+ foreach($property->parameters as $parameter){
+ $temp['parameters'][$parameter->name] = $parameter->value;
+ }
+ return $temp;
+ }
}
diff --git a/apps/contacts/lib/connector_sabre.php b/apps/contacts/lib/connector_sabre.php
index 98e2598b3a7..96a90dfc5de 100644
--- a/apps/contacts/lib/connector_sabre.php
+++ b/apps/contacts/lib/connector_sabre.php
@@ -1,13 +1,23 @@
.
+ *
*/
/**
diff --git a/apps/contacts/templates/_details.php b/apps/contacts/templates/_details.php
deleted file mode 100644
index e27b17ef2eb..00000000000
--- a/apps/contacts/templates/_details.php
+++ /dev/null
@@ -1,4 +0,0 @@
-Name
-
- 
-
\ No newline at end of file
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
index ca189cb4c8a..e6dd45739bc 100644
--- a/apps/contacts/templates/index.php
+++ b/apps/contacts/templates/index.php
@@ -3,7 +3,8 @@ OC_Util::addScript('contacts','interface');
OC_Util::addStyle('contacts','styles');
?>
-
-
- inc("_details"); ?>
+
+ inc("part.details"); ?>
diff --git a/apps/contacts/templates/part.addcardform.php b/apps/contacts/templates/part.addcardform.php
new file mode 100644
index 00000000000..94a59fe097c
--- /dev/null
+++ b/apps/contacts/templates/part.addcardform.php
@@ -0,0 +1,13 @@
+
diff --git a/apps/contacts/templates/part.addpropertyform.php b/apps/contacts/templates/part.addpropertyform.php
new file mode 100644
index 00000000000..ff9090b76d8
--- /dev/null
+++ b/apps/contacts/templates/part.addpropertyform.php
@@ -0,0 +1,43 @@
+
+
diff --git a/apps/contacts/templates/_contacts.php b/apps/contacts/templates/part.contacts.php
similarity index 95%
rename from apps/contacts/templates/_contacts.php
rename to apps/contacts/templates/part.contacts.php
index bf633b79b04..fa6d4790cfc 100644
--- a/apps/contacts/templates/_contacts.php
+++ b/apps/contacts/templates/part.contacts.php
@@ -1,3 +1,3 @@
-
+
diff --git a/apps/contacts/templates/part.details.php b/apps/contacts/templates/part.details.php
new file mode 100644
index 00000000000..4aca8dbc790
--- /dev/null
+++ b/apps/contacts/templates/part.details.php
@@ -0,0 +1,22 @@
+
+
+
+inc('part.property', array('property' => $_['details']['FN'][0])); ?>
+
+ inc('part.property', array('property' => $_['details']['BDAY'][0])); ?>
+
+
+ inc('part.property', array('property' => $_['details']['ORG'][0])); ?>
+
+
+
+
+
+
+ inc('part.property',array('property' => $property )); ?>
+
+
+
+
+
+
diff --git a/apps/contacts/templates/part.property.php b/apps/contacts/templates/part.property.php
new file mode 100644
index 00000000000..1a4266b3a2b
--- /dev/null
+++ b/apps/contacts/templates/part.property.php
@@ -0,0 +1,50 @@
+
diff --git a/apps/contacts/templates/part.setpropertyform.php b/apps/contacts/templates/part.setpropertyform.php
new file mode 100644
index 00000000000..cd774ee6593
--- /dev/null
+++ b/apps/contacts/templates/part.setpropertyform.php
@@ -0,0 +1,21 @@
+
diff --git a/apps/contacts/temporaryupdate.php b/apps/contacts/temporaryupdate.php
index bb5ff7604f3..4b6453364e3 100644
--- a/apps/contacts/temporaryupdate.php
+++ b/apps/contacts/temporaryupdate.php
@@ -1,4 +1,24 @@
.
+ *
+ */
// Init owncloud
require_once('../../lib/base.php');
$connector = new OC_Connector_Sabre_Principal;
diff --git a/apps/files_publiclink/appinfo/app.php b/apps/files_publiclink/appinfo/app.php
index 17646b3e5b5..e2d8d27c007 100644
--- a/apps/files_publiclink/appinfo/app.php
+++ b/apps/files_publiclink/appinfo/app.php
@@ -1,6 +1,6 @@
"files_publiclink_administration", "order" => 1, "href" => OC_Helper::linkTo( "files_publiclink", "admin.php" ), "name" => "Public Links"));
+OC_App::addNavigationEntry(array( "id" => "files_publiclink_administration", "order" => 2, "href" => OC_Helper::linkTo( "files_publiclink", "admin.php" ), "name" => "Public Links"));
?>
diff --git a/apps/media/appinfo/app.php b/apps/media/appinfo/app.php
index 4cdb36d4504..bc80536a969 100644
--- a/apps/media/appinfo/app.php
+++ b/apps/media/appinfo/app.php
@@ -27,34 +27,4 @@ OC_Util::addScript('media','loader');
OC_App::register( array( 'order' => 3, 'id' => 'media', 'name' => 'Media' ));
OC_App::addNavigationEntry( array( 'id' => 'media_index', 'order' => 2, 'href' => OC_Helper::linkTo( 'media', 'index.php' ), 'icon' => OC_Helper::imagePath( 'media', 'media.png' ), 'name' => 'Music' ));
-
-// add subnavigations
-$entry = array(
- 'id' => "media_playlist",
- 'order'=>1,
- 'href' => '#playlist',
- 'name' => 'Playlist'
-);
-OC_App::addNavigationSubEntry( "media_index", $entry);
-$entry = array(
- 'id' => "media_collection",
- 'order'=>1,
- 'href' => '#collection',
- 'name' => 'Collection'
-);
-OC_App::addNavigationSubEntry( "media_index", $entry);
-// $entry = array(
-// 'id' => "media_recent",
-// 'order'=>1,
-// 'href' => '#recent',
-// 'name' => 'Most Recent'
-// );
-// OC_App::addNavigationSubEntry( "media_index", $entry);
-// $entry = array(
-// 'id' => "media_mostplayer",
-// 'order'=>1,
-// 'href' => '#mostplayed',
-// 'name' => 'Most Played'
-// );
-// OC_App::addNavigationSubEntry( "media_index", $entry);
?>
diff --git a/apps/media/css/music.css b/apps/media/css/music.css
index 3637234ab13..dd9b8ea70d9 100644
--- a/apps/media/css/music.css
+++ b/apps/media/css/music.css
@@ -3,7 +3,7 @@
li button.right.prettybutton{font-size:1em;}
#collection{padding-top:1em;position:relative;width:70ex;float:left;}
#collection li.album,#collection li.song{margin-left:3ex;}
-#playlist{width:100%;border-spacing:0;}
+#playlist{border-spacing:0;}
#playlist th{background-color:#ccc; text-align:left; font-size:1.2em; padding:0.2em}
#playlist tr.selected{background-color:#eee;}
#playlist tr.current{background-color:#ccc;}
@@ -12,7 +12,8 @@ li button.right.prettybutton{font-size:1em;}
#collection li,#playlist li{list-style-type:none;}
.template{display:none}
-#collection{display:none}/*hide the collection initially*/
#collection li{padding-right:10px;}
img.remove{float:right;}
#searchresults input.play, #searchresults input.add{float:right; height:16px; width:16px;}
+#collection tr.collapsed td.album, #collection tr.collapsed td.title{color:#ddd}
+a.expander{float:right;display:block}
diff --git a/apps/media/css/player.css b/apps/media/css/player.css
index 94dd4d63605..6cf424a8ea1 100644
--- a/apps/media/css/player.css
+++ b/apps/media/css/player.css
@@ -1,29 +1,25 @@
-#jp-interface{position:fixed;z-index:100;width:25em;left:201px;top:-20px;height:60px;border-bottom:none;}
-#jp-interface div.player{height:0px}
-#jp-interface ul.jp-controls{list-style-type:none;padding:0;}
-#jp-interface ul.jp-controls li{display:inline;}
-#jp-interface ul.jp-controls a{position:absolute;overflow:hidden;text-indent:-9999px;}
-a.jp-play,a.jp-pause{width:40px;height:40px;z-index:1;top:20px;left:48px;}
+#controls ul.jp-controls{list-style-type:none;padding:0;}
+#controls ul.jp-controls li{display:inline;}
+#controls ul.jp-controls a{position:absolute;overflow:hidden;text-indent:-9999px;}
+a.jp-play,a.jp-pause{width:40px;height:40px;z-index:1;top:0;left:48px;}
a.jp-play{background:url("../img/jplayer.blue.monday.png") 0 0 no-repeat;}
a.jp-play:hover{background:url("../img/jplayer.blue.monday.png") -41px 0 no-repeat;}
a.jp-pause{background:url("../img/jplayer.blue.monday.png") 0 -42px no-repeat;display:none;}
a.jp-pause:hover{background:url("../img/jplayer.blue.monday.png") -41px -42px no-repeat;}
-a.jp-stop{top:26px;left:126px;background:url("../img/jplayer.blue.monday.png") 0 -83px no-repeat;width:28px;height:28px;z-index:1;}
-a.jp-stop:hover{background:url("../img/jplayer.blue.monday.png") -29px -83px no-repeat;}
-a.jp-previous{left:20px;top:26px;background:url("../img/jplayer.blue.monday.png") 0 -112px no-repeat;width:28px;height:28px;}
+a.jp-previous{left:20px;top:.5em;background:url("../img/jplayer.blue.monday.png") 0 -112px no-repeat;width:28px;height:28px;}
a.jp-previous:hover{background:url("../img/jplayer.blue.monday.png") -29px -112px no-repeat;}
-a.jp-next{left:88px;top:26px;background:url("../img/jplayer.blue.monday.png") 0 -141px no-repeat;width:28px;height:28px;}
+a.jp-next{left:88px;top:.5em;background:url("../img/jplayer.blue.monday.png") 0 -141px no-repeat;width:28px;height:28px;}
a.jp-next:hover{background:url("../img/jplayer.blue.monday.png") -29px -141px no-repeat;}
-div.jp-progress{position:absolute;overflow:hidden;background-color:#293b51;top:32px;left:164px;width:122px;height:15px;}
+div.jp-progress{position:absolute;overflow:hidden;background-color:#293b51;top:1em;left:164px;width:122px;height:15px;}
div.jp-seek-bar{background:url("../img/jplayer.blue.monday.png") 0 -202px repeat-x;width:0;height:100%;cursor:pointer;}
div.jp-play-bar{background:url("../img/jplayer.blue.monday.png") 0 -218px repeat-x;width:0;height:100%;}
div.jp-seeking-bg{background:url("../img/pbar-ani.gif");}
-a.jp-mute,a.jp-unmute{height:15px;width:18px;top:32px;left:296px;}
+a.jp-mute,a.jp-unmute{height:15px;width:18px;top:1em;left:296px;}
a.jp-mute{background:url("../img/jplayer.blue.monday.png") 0 -186px no-repeat;}
a.jp-mute:hover{background:url("../img/jplayer.blue.monday.png") -19px -170px no-repeat;}
a.jp-unmute{background:url("../img/jplayer.blue.monday.png") 0 -170px no-repeat;display:none;}
a.jp-unmute:hover{background:url("../img/jplayer.blue.monday.png") -19px -186px no-repeat;}
-div.jp-volume-bar{position:absolute;overflow:hidden;background:url("../img/jplayer.blue.monday.png") 0 -250px repeat-x;width:46px;height:5px;cursor:pointer;top:37px;left:324px;}
+div.jp-volume-bar{position:absolute;overflow:hidden;background:url("../img/jplayer.blue.monday.png") 0 -250px repeat-x;width:46px;height:5px;cursor:pointer;top:1.3em;left:324px;}
div.jp-volume-bar-value{background:url("../img/jplayer.blue.monday.png") 0 -256px repeat-x;width:0;height:5px;}
-div.jp-current-time,div.jp-duration{position:absolute;font-size:.64em;font-style:oblique;top:45px;left:164px;width:122px;}
+div.jp-current-time,div.jp-duration{position:absolute;font-size:.64em;font-style:oblique;top:1em;left:164px;width:122px;}
div.jp-duration{text-align:right;}
diff --git a/apps/media/index.php b/apps/media/index.php
index a7128aaad42..fe724b45ddf 100644
--- a/apps/media/index.php
+++ b/apps/media/index.php
@@ -42,17 +42,9 @@ OC_Util::addScript('media','jquery.jplayer.min');
OC_Util::addStyle('media','player');
OC_Util::addStyle('media','music');
-OC_App::setActiveNavigationEntry( 'media_playlist' );
+OC_App::setActiveNavigationEntry( 'media_index' );
$tmpl = new OC_Template( 'media', 'music', 'user' );
-
-$player = new OC_Template( 'media', 'player');
-$playlist = new OC_Template( 'media', 'playlist');
-$collection= new OC_Template( 'media', 'collection');
-
-$tmpl->assign('player',$player->fetchPage());
-$tmpl->assign('playlist',$playlist->fetchPage());
-$tmpl->assign('collection',$collection->fetchPage());
$tmpl->printPage();
?>
diff --git a/apps/media/js/collection.js b/apps/media/js/collection.js
index 520ce7d1129..df7b79e332d 100644
--- a/apps/media/js/collection.js
+++ b/apps/media/js/collection.js
@@ -49,68 +49,106 @@ Collection={
Collection.load(Collection.display)
}else{
if(Collection.parent){
- Collection.parent.children('li.artist').remove();
- var template=Collection.parent.children('li.template');
- for(var i=0;i
1){
+ var expander=$('>');
+ expander.data('expanded',true);
+ expander.click(function(event){
+ var tr=$(this).parent().parent();
+ if(expander.data('expanded')){
+ Collection.hideArtist(tr.data('artist'));
+ }else{
+ Collection.showArtist(tr.data('artist'));
+ }
+ });
+ tr.children('td.artist').append(expander);
+ }
+ }
+ if(album.album_name!=lastAlbum){
+ tr.find('td.album a').click(function(event){
+ event.preventDefault();
+ PlayList.add(album);
+ PlayList.render();
+ });
+ tr.find('td.album a').text(album.album_name);
+ if(album.songs.length>1){
+ var expander=$('>');
+ expander.data('expanded',true);
+ expander.click(function(event){
+ var tr=$(this).parent().parent();
+ if(expander.data('expanded')){
+ Collection.hideAlbum(tr.data('album'));
+ }else{
+ Collection.showAlbum(tr.data('album'));
+ }
+ });
+ tr.children('td.album').append(expander);
+ }
+ }
+ tr.attr('data-artist',artist.artist_name);
+ tr.attr('data-album',album.album_name);
+ lastArtist=artist.artist_name;
+ lastAlbum=album.album_name;
+
+ Collection.parent.find('tbody').append(tr);
+ });
+ Collection.hideAlbum(artist.artist_name,album.album_name);
+ });
+ Collection.hideArtist(artist.artist_name);
+ });
}
}
},
+ showArtist:function(artist){
+ Collection.parent.find('tr[data-artist="'+artist+'"]').show();
+ Collection.parent.find('tr[data-artist="'+artist+'"]').first().removeClass('collapsed');
+ Collection.parent.find('tr[data-artist="'+artist+'"] a.expander').data('expanded',true);
+ Collection.parent.find('tr[data-artist="'+artist+'"] a.expander').addClass('expanded');
+ Collection.parent.find('tr[data-artist="'+artist+'"] a.expander').text('v');
+ },
+ hideArtist:function(artist){
+ if(Collection.parent.find('tr[data-artist="'+artist+'"]').length>1){
+ Collection.parent.find('tr[data-artist="'+artist+'"]').hide();
+ Collection.parent.find('tr[data-artist="'+artist+'"]').first().show();
+ Collection.parent.find('tr[data-artist="'+artist+'"]').first().addClass('collapsed');
+ Collection.parent.find('tr[data-artist="'+artist+'"] a.expander').data('expanded',false);
+ Collection.parent.find('tr[data-artist="'+artist+'"] a.expander').removeClass('expanded');
+ Collection.parent.find('tr[data-artist="'+artist+'"] a.expander').text('>');
+ }
+ },
+ showAlbum:function(artist,album){
+ Collection.parent.find('tr[data-artist="'+artist+'"][data-album="'+album+'"]').show();
+ },
+ hideAlbum:function(artist,album){
+ Collection.parent.find('tr[data-artist="'+artist+'"][data-album="'+album+'"]').hide();
+ Collection.parent.find('tr[data-artist="'+artist+'"][data-album="'+album+'"]').last().show();
+ },
parent:null,
hide:function(){
if(Collection.parent){
Collection.parent.hide();
}
},
- showAlbums:function(artistLi){
- $('ul.albums').parent().removeClass('active');
- $('ul.albums').remove();
- var artist=artistLi.data('artist');
- if(artist){
- var template=Collection.parent.children('li.template');
- var ul=$('');
- for(var i=0;i');
- for(var i=0;ispan').live('click',function(){
- $(this).parent().toggleClass('active');
- Collection.showAlbums($(this).parent());
- });
- $('#collection li.album>span').live('click',function(){
- $(this).parent().toggleClass('active');
- Collection.showSongs($(this).parent());
- });
Collection.parent.hide();
$('#scan input.start').click(function(){
$('#scan input.start').hide();
diff --git a/apps/media/js/music.js b/apps/media/js/music.js
index 4e11b2951be..7034824cad8 100644
--- a/apps/media/js/music.js
+++ b/apps/media/js/music.js
@@ -1,23 +1,4 @@
$(document).ready(function(){
- //load the collection
- $('#navigation a[href="#collection"]').click(function(){
- $('#navigation li.subentry a.active').removeClass('active');
- $(this).addClass('active');
- PlayList.hide();
- Collection.display();
- });
- $('#navigation a[href="#playlist"]').click(function(){
- $('#navigation li.subentry a.active').removeClass('active');
- $(this).addClass('active');
- PlayList.render();
- Collection.hide();
- });
- var tab=window.location.href.slice(window.location.href.indexOf('#') + 1);
- PlayList.init('mp3',function(){
- if(tab=='collection'){
- $('#navigation a[href="#collection"]').trigger('click');
- }
- });
OC.search.customResults.Music=function(row,item){
var parts=item.link.substr(item.link.indexOf('#')+1).split('&');
var data={};
@@ -43,6 +24,7 @@ $(document).ready(function(){
});
row.find('div.name').append(button);
}
+ Collection.display();
});
diff --git a/apps/media/js/playlist.js b/apps/media/js/playlist.js
index a15c34f93f9..636ae29c555 100644
--- a/apps/media/js/playlist.js
+++ b/apps/media/js/playlist.js
@@ -10,19 +10,9 @@ PlayList.render=function(){
tr.removeClass('template');
tr.data('name',item.name);
tr.data('artist',item.artist);
- tr.data('album',item.album);
- tr.data('time',item.length);
- tr.data('plays',item.playcount);
tr.children('td.name').children('span').text(item.name);
tr.children('td.artist').text(item.artist);
tr.children('td.album').text(item.album);
- var secconds=(item.length%60);
- if(secconds<10){
- secconds='0'+secconds;
- }
- var length=Math.floor(item.length/60)+':'+secconds;
- tr.children('td.time').text(length);
- tr.children('td.plays').text(item.playcount);
tr.data('index',i);
tr.click(function(){
PlayList.play($(this).data('index'));
diff --git a/apps/media/js/settings.js b/apps/media/js/settings.js
deleted file mode 100644
index 3dabd86a497..00000000000
--- a/apps/media/js/settings.js
+++ /dev/null
@@ -1,65 +0,0 @@
-$(document).ready(function() {
- $("button.scan").click(function(event){
- event.preventDefault();
- var parent=$(this).parent().parent();
- var path=parent.children('input').val();
- scan(path);
- });
- $("button.rescan").live('click', function(event) {
- event.preventDefault();
- var parent=$(this).parent().parent();
- var path=parent.contents().filter(function(){ return(this.nodeType == 3); }).text();
- path=path.trim();
- scan(path);
- });
- $("button.delete").live('click', function(event) {
- event.preventDefault();
- var parent=$(this).parent().parent();
- var path=parent.contents().filter(function(){ return(this.nodeType == 3); }).text();
- path=path.trim();
- var data="action=delete&path="+path;
- $.ajax({
- type: 'POST',
- url: 'ajax/api.php',
- cache: false,
- data: data,
- success: function(){
- parent.remove();
- }
- });
- });
- $( "#scanpath" ).autocomplete({
- source: "../../files/ajax/autocomplete.php?dironly=true",
- minLength: 1
- });
- $('#autoupdate').change(function(){
- $.ajax({
- url: 'ajax/autoupdate.php',
- data: "autoupdate="+$(this).attr('checked')
- });
- })
-});
-
-function scan(path){
- var data="action=scan&path="+path;
- $.ajax({
- type: 'POST',
- url: 'ajax/api.php',
- cache: false,
- data: data,
- success: function(songCount){
- var found=false;
- $('#folderlist').children('li').each(function(){
- var otherPath=$(this).contents().filter(function(){ return(this.nodeType == 3); }).text();
- otherPath=otherPath.trim();
- if(otherPath==path){
- found=true;
- $(this).children("span").html(songCount+" songs ");
- }
- })
- if(!found){
- $('#folderlist').children().last().before(""+path+""+songCount+" songs ");
- }
- }
- });
-}
diff --git a/apps/media/templates/collection.php b/apps/media/templates/collection.php
deleted file mode 100644
index f47cba24868..00000000000
--- a/apps/media/templates/collection.php
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
0 Songs scanned
-
-
-
-
- -
-
 ?>)
Loading Collection...
-
- -
-
-
-
-
-
-
diff --git a/apps/media/templates/music.php b/apps/media/templates/music.php
index 7a61d59c9ba..5d0b0b6f0c4 100644
--- a/apps/media/templates/music.php
+++ b/apps/media/templates/music.php
@@ -1,3 +1,71 @@
-
-
-
+
+
+
+
+
+
+
0 Songs scanned
+
+
+
+
+
+
+ | Artist |
+ Album |
+ Title |
+
+
+
+ |
+ |
+ |
+
+
+
+
-
-
- -
- t( 'Error 404, Cloud not found' ); ?>
-
-
-
-
+ -
+ t( 'Cloud not found' ); ?>
+
+
+
diff --git a/core/templates/error.php b/core/templates/error.php
index aa8a8d473b4..4f05e008f99 100644
--- a/core/templates/error.php
+++ b/core/templates/error.php
@@ -1,12 +1,8 @@
-
-
+
diff --git a/core/templates/installation.php b/core/templates/installation.php
index de14c562419..e9f7daf7b89 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -1,85 +1,78 @@
-
+
+
diff --git a/core/templates/layout.admin.php b/core/templates/layout.admin.php
deleted file mode 100644
index d70c54f7b15..00000000000
--- a/core/templates/layout.admin.php
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
- ownCloud
-
-
-
-
-
-
-
-
-
-
- $value){
- echo "$name='$value' ";
- };
- echo '>';
- echo $header['text'];
- echo '';
- ?>
-
-
-
-
-
-
-
-
-
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 0b6189ef1c9..21388509f35 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -29,7 +29,12 @@
-
- t( 'ownCloud is a personal cloud which runs on your own server.
' ); ?>
+
+
+
+
+