From 6f75041b5802c6bfa71336527febc29270a71d97 Mon Sep 17 00:00:00 2001 From: Nicolas Mora Date: Sun, 11 Aug 2013 20:41:02 -0400 Subject: [PATCH] use specific branch --- ajax/personalsettings.php | 48 --------- css/personalsettings.css | 17 ---- js/personalsettings.js | 177 --------------------------------- personalsettings.php | 38 ------- templates/personalsettings.php | 67 ------------- 5 files changed, 347 deletions(-) delete mode 100644 ajax/personalsettings.php delete mode 100644 css/personalsettings.css delete mode 100644 js/personalsettings.js delete mode 100644 personalsettings.php delete mode 100644 templates/personalsettings.php diff --git a/ajax/personalsettings.php b/ajax/personalsettings.php deleted file mode 100644 index e2699555..00000000 --- a/ajax/personalsettings.php +++ /dev/null @@ -1,48 +0,0 @@ -. - * - */ - -namespace OCA\Contacts\Ajax; - -// Check user and app status -\OCP\User::checkLoggedIn(); -\OCP\App::checkAppEnabled('contacts'); -\OCP\JSON::callCheck(); - -switch($_GET['function']) { - case 'list': - $ldap = new OCA\Contacts\Backend\Ldap(); - $addressbooks = $ldap->getAllAddressBooksForUser(\OCP\User::getUser()); - \OCP\JSON::success(array('ldapArray' => $addressbooks)); - break; - case 'details': - $ldap = new OCA\Contacts\Backend\Ldap(); - $addressbooks = $ldap->getAllAddressBooksForUser(\OCP\User::getUser()); - \OCP\JSON::success(array('ldapArray' => $addressbooks)); - break - case 'save': - break; - case 'delete': - break; - case 'test': - break; -} diff --git a/css/personalsettings.css b/css/personalsettings.css deleted file mode 100644 index 3b3a8717..00000000 --- a/css/personalsettings.css +++ /dev/null @@ -1,17 +0,0 @@ -#contactsldap fieldset p label { - width: 20%; - max-width: 200px; - display: inline-block; - vertical-align: top; - padding-top: 9px; -} - -#contactsldap fieldset input, #contactsldap fieldset textarea { - width: 70%; - display: inline-block; -} - -.ldapwarning { - margin-left: 1.4em; - color: #FF3B3B; -} diff --git a/js/personalsettings.js b/js/personalsettings.js deleted file mode 100644 index 86e05a79..00000000 --- a/js/personalsettings.js +++ /dev/null @@ -1,177 +0,0 @@ -var LdapConfiguration = { - refreshConfig: function() { - if($('#ldap_addressbook_chooser option').length < 2) { - LdapConfiguration.addConfiguration(true); - return; - } - $.post( - OC.filePath('contacts','ajax','personalsettings.php?function=list'), - $('#ldap_addressbook_chooser').serialize(), - function (result) { - if(result.status == 'success') { - $.each(result.ldapArray, function(configkey, configvalue) { - elementID = '#'+configkey; - - - //deal with Checkboxes - if($(elementID).is('input[type=checkbox]')) { - if(configvalue == 1) { - $(elementID).attr('checked', 'checked'); - } else { - $(elementID).removeAttr('checked'); - } - return; - } - - //On Textareas, Multi-Line Settings come as array - if($(elementID).is('textarea') && $.isArray(configvalue)) { - configvalue = configvalue.join("\n"); - } - - // assign the value - $('#'+configkey).val(configvalue); - }); - } - } - ); - }, - - resetDefaults: function() { - $('#ldap').find('input[type=text], input[type=number], input[type=password], textarea, select').each(function() { - if($(this).attr('id') == 'ldap_serverconfig_chooser') { - return; - } - $(this).val($(this).attr('data-default')); - }); - $('#ldap').find('input[type=checkbox]').each(function() { - if($(this).attr('data-default') == 1) { - $(this).attr('checked', 'checked'); - } else { - $(this).removeAttr('checked'); - } - }); - }, - - deleteConfiguration: function() { - $.post( - OC.filePath('contacts','ajax','deleteConfiguration.php'), - $('#ldap_serverconfig_chooser').serialize(), - function (result) { - if(result.status == 'success') { - $('#ldap_serverconfig_chooser option:selected').remove(); - $('#ldap_serverconfig_chooser option:first').select(); - LdapConfiguration.refreshConfig(); - } else { - OC.dialogs.alert( - result.message, - t('contacts', 'Deletion failed') - ); - } - } - ); - }, - - addConfiguration: function(doNotAsk) { - $.post( - OC.filePath('contacts','ajax','getNewServerConfigPrefix.php'), - function (result) { - if(result.status == 'success') { - if(doNotAsk) { - LdapConfiguration.resetDefaults(); - } else { - OC.dialogs.confirm( - t('contacts', 'Take over settings from recent server configuration?'), - t('contacts', 'Keep settings?'), - function(keep) { - if(!keep) { - LdapConfiguration.resetDefaults(); - } - } - ); - } - $('#ldap_serverconfig_chooser option:selected').removeAttr('selected'); - var html = ''; - $('#ldap_serverconfig_chooser option:last').before(html); - } else { - OC.dialogs.alert( - result.message, - t('contacts', 'Cannot add server configuration') - ); - } - } - ); - } -} - -$(document).ready(function() { - $('#ldapAdvancedAccordion').accordion({ heightStyle: 'content', animate: 'easeInOutCirc'}); - $('#ldap_submit').button(); - $('#ldap_action_test_connection').button(); - $('#ldap_action_delete_configuration').button(); - LdapConfiguration.refreshConfig(); - $('#ldap_action_test_connection').click(function(event){ - event.preventDefault(); - $.post( - OC.filePath('contacts','ajax','personalsettings.php?function=test'), - $('#ldap').serialize(), - function (result) { - if (result.status == 'success') { - OC.dialogs.alert( - result.message, - t('contacts', 'Connection test succeeded') - ); - } else { - OC.dialogs.alert( - result.message, - t('contacts', 'Connection test failed') - ); - } - } - ); - }); - - $('#ldap_action_delete_configuration').click(function(event) { - event.preventDefault(); - OC.dialogs.confirm( - t('contacts', 'Do you really want to delete the current Server Configuration?'), - t('contacts', 'Confirm Deletion'), - function(deleteConfiguration) { - if(deleteConfiguration) { - LdapConfiguration.deleteConfiguration(); - } - } - ); - }); - - $('#ldap_submit').click(function(event) { - event.preventDefault(); - $.post( - OC.filePath('contacts','ajax','setConfiguration.php'), - $('#ldap').serialize(), - function (result) { - bgcolor = $('#ldap_submit').css('background'); - if (result.status == 'success') { - //the dealing with colors is a but ugly, but the jQuery version in use has issues with rgba colors - $('#ldap_submit').css('background', '#fff'); - $('#ldap_submit').effect('highlight', {'color':'#A8FA87'}, 5000, function() { - $('#ldap_submit').css('background', bgcolor); - }); - } else { - $('#ldap_submit').css('background', '#fff'); - $('#ldap_submit').effect('highlight', {'color':'#E97'}, 5000, function() { - $('#ldap_submit').css('background', bgcolor); - }); - } - } - ); - }); - - $('#ldap_addressbook_chooser').change(function(event) { - value = $('#ldap_addressbook_chooser option:selected:first').attr('value'); - if(value == 'NEW') { - LdapConfiguration.addConfiguration(false); - } else { - LdapConfiguration.refreshConfig(); - } - }); -}); diff --git a/personalsettings.php b/personalsettings.php deleted file mode 100644 index 6c1817c5..00000000 --- a/personalsettings.php +++ /dev/null @@ -1,38 +0,0 @@ -. - * - */ - -\OCP\User::checkLoggedIn(); -\OCP\App::checkAppEnabled('contacts'); - -OCP\Util::addscript('contacts', 'personalsettings'); -OCP\Util::addstyle('contacts', 'personalsettings'); - -// fill template -$tmpl = new OCP\Template('contacts', 'personalsettings'); - -$ldap = new OCA\Contacts\Backend\Ldap(); -//$ldapArray = $ldap->getAllAddressBooksForUser(\OCP\User::getUser()); - -$tmpl->assign('ldapArray', $ldapArray); - -return $tmpl->fetchPage(); diff --git a/templates/personalsettings.php b/templates/personalsettings.php deleted file mode 100644 index 279ae7f1..00000000 --- a/templates/personalsettings.php +++ /dev/null @@ -1,67 +0,0 @@ -
-
-
    -
  • t('LDAP Directories for Contacts'));?>
    • -
-
-

- - -

- -

-

- -

-

- -

-

- -

-

- -

-

- -

-

- -

-

- -

-

- -

-

- -

-

- -

-

- -
- t('Help'));?> -
- -