Remove obsolete files.

diff --git a/core/ajax/vcategories/add.php b/core/ajax/vcategories/add.php
deleted file mode 100644 (file)
index 16a1461..0000000
--- a/core/ajax/vcategories/add.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-function bailOut($msg) {
-       OC_JSON::error(array('data' => array('message' => $msg)));
-       OC_Log::write('core', 'ajax/vcategories/add.php: '.$msg, OC_Log::DEBUG);
-       exit();
-}
-function debug($msg) {
-       OC_Log::write('core', 'ajax/vcategories/add.php: '.$msg, OC_Log::DEBUG);
-}
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-$l = OC_L10N::get('core');
-
-$category = isset($_POST['category']) ? strip_tags($_POST['category']) : null;
-$type = isset($_POST['type']) ? $_POST['type'] : null;
-
-if(is_null($type)) {
-       bailOut($l->t('Category type not provided.'));
-}
-
-if(is_null($category)) {
-       bailOut($l->t('No category to add?'));
-}
-
-debug(print_r($category, true));
-
-$categories = new OC_VCategories($type);
-if($categories->hasCategory($category)) {
-       bailOut($l->t('This category already exists: %s', array($category)));
-} else {
-       $categories->add($category, true);
-}
-
-OC_JSON::success(array('data' => array('categories'=>$categories->categories())));

diff --git a/core/ajax/vcategories/addToFavorites.php b/core/ajax/vcategories/addToFavorites.php
deleted file mode 100644 (file)
index 52f62d5..0000000
--- a/core/ajax/vcategories/addToFavorites.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-function bailOut($msg) {
-       OC_JSON::error(array('data' => array('message' => $msg)));
-       OC_Log::write('core', 'ajax/vcategories/addToFavorites.php: '.$msg, OC_Log::DEBUG);
-       exit();
-}
-function debug($msg) {
-       OC_Log::write('core', 'ajax/vcategories/addToFavorites.php: '.$msg, OC_Log::DEBUG);
-}
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-$l = OC_L10N::get('core');
-
-$id = isset($_POST['id']) ? strip_tags($_POST['id']) : null;
-$type = isset($_POST['type']) ? $_POST['type'] : null;
-
-if(is_null($type)) {
-       bailOut($l->t('Object type not provided.'));
-}
-
-if(is_null($id)) {
-       bailOut($l->t('%s ID not provided.', $type));
-}
-
-$categories = new OC_VCategories($type);
-if(!$categories->addToFavorites($id, $type)) {
-       bailOut($l->t('Error adding %s to favorites.', $id));
-}
-
-OC_JSON::success();

diff --git a/core/ajax/vcategories/delete.php b/core/ajax/vcategories/delete.php
deleted file mode 100644 (file)
index dfec378..0000000
--- a/core/ajax/vcategories/delete.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-function bailOut($msg) {
-       OC_JSON::error(array('data' => array('message' => $msg)));
-       OC_Log::write('core', 'ajax/vcategories/delete.php: '.$msg, OC_Log::DEBUG);
-       exit();
-}
-function debug($msg) {
-       OC_Log::write('core', 'ajax/vcategories/delete.php: '.$msg, OC_Log::DEBUG);
-}
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-$l = OC_L10N::get('core');
-
-$type = isset($_POST['type']) ? $_POST['type'] : null;
-$categories = isset($_POST['categories']) ? $_POST['categories'] : null;
-
-if(is_null($type)) {
-       bailOut($l->t('Object type not provided.'));
-}
-
-debug('The application using category type "'
-       . $type
-       . '" uses the default file for deletion. OC_VObjects will not be updated.');
-
-if(is_null($categories)) {
-       bailOut($l->t('No categories selected for deletion.'));
-}
-
-$vcategories = new OC_VCategories($type);
-$vcategories->delete($categories);
-OC_JSON::success(array('data' => array('categories'=>$vcategories->categories())));

diff --git a/core/ajax/vcategories/edit.php b/core/ajax/vcategories/edit.php
deleted file mode 100644 (file)
index 0387b17..0000000
--- a/core/ajax/vcategories/edit.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-function bailOut($msg) {
-       OC_JSON::error(array('data' => array('message' => $msg)));
-       OC_Log::write('core', 'ajax/vcategories/edit.php: '.$msg, OC_Log::DEBUG);
-       exit();
-}
-function debug($msg) {
-       OC_Log::write('core', 'ajax/vcategories/edit.php: '.$msg, OC_Log::DEBUG);
-}
-
-OC_JSON::checkLoggedIn();
-
-$l = OC_L10N::get('core');
-
-$type = isset($_GET['type']) ? $_GET['type'] : null;
-
-if(is_null($type)) {
-       bailOut($l->t('Category type not provided.'));
-}
-
-$tmpl = new OCP\Template("core", "edit_categories_dialog");
-
-$vcategories = new OC_VCategories($type);
-$categories = $vcategories->categories();
-debug(print_r($categories, true));
-$tmpl->assign('categories', $categories);
-$tmpl->printpage();

diff --git a/core/ajax/vcategories/favorites.php b/core/ajax/vcategories/favorites.php
deleted file mode 100644 (file)
index db4244d..0000000
--- a/core/ajax/vcategories/favorites.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-function bailOut($msg) {
-       OC_JSON::error(array('data' => array('message' => $msg)));
-       OC_Log::write('core', 'ajax/vcategories/addToFavorites.php: '.$msg, OC_Log::DEBUG);
-       exit();
-}
-function debug($msg) {
-       OC_Log::write('core', 'ajax/vcategories/addToFavorites.php: '.$msg, OC_Log::DEBUG);
-}
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-$type = isset($_GET['type']) ? $_GET['type'] : null;
-
-if(is_null($type)) {
-       $l = OC_L10N::get('core');
-       bailOut($l->t('Object type not provided.'));
-}
-
-$categories = new OC_VCategories($type);
-$ids = $categories->getFavorites($type);
-
-OC_JSON::success(array('ids' => $ids));

diff --git a/core/ajax/vcategories/removeFromFavorites.php b/core/ajax/vcategories/removeFromFavorites.php
deleted file mode 100644 (file)
index 78a528c..0000000
--- a/core/ajax/vcategories/removeFromFavorites.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-function bailOut($msg) {
-       OC_JSON::error(array('data' => array('message' => $msg)));
-       OC_Log::write('core', 'ajax/vcategories/removeFromFavorites.php: '.$msg, OC_Log::DEBUG);
-       exit();
-}
-function debug($msg) {
-       OC_Log::write('core', 'ajax/vcategories/removeFromFavorites.php: '.$msg, OC_Log::DEBUG);
-}
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-$l = OC_L10N::get('core');
-
-$id = isset($_POST['id']) ? strip_tags($_POST['id']) : null;
-$type = isset($_POST['type']) ? $_POST['type'] : null;
-
-if(is_null($type)) {
-       bailOut($l->t('Object type not provided.'));
-}
-
-if(is_null($id)) {
-       bailOut($l->t('%s ID not provided.', array($type)));
-}
-
-$categories = new OC_VCategories($type);
-if(!$categories->removeFromFavorites($id, $type)) {
-       bailOut($l->t('Error removing %s from favorites.', array($id)));
-}
-
-OC_JSON::success();

diff --git a/core/js/oc-vcategories.js b/core/js/oc-vcategories.js
deleted file mode 100644 (file)
index c297a24..0000000
--- a/core/js/oc-vcategories.js
+++ /dev/null
@@ -1,216 +0,0 @@
-var OCCategories= {
-       category_favorites:'_$!<Favorite>!$_',
-       edit:function(type, cb) {
-               if(!type && !this.type) {
-                       throw { name: 'MissingParameter', message: t('core', 'The object type is not specified.') };
-               }
-               type = type ? type : this.type;
-               $('body').append('<div id="category_dialog"></div>');
-               $('#category_dialog').load(
-                       OC.filePath('core', 'ajax', 'vcategories/edit.php') + '?type=' + type, function(response) {
-                       try {
-                               var jsondata = jQuery.parseJSON(response);
-                               if(response.status == 'error') {
-                                       OC.dialogs.alert(response.data.message, t('core', 'Error'));
-                                       return;
-                               }
-                       } catch(e) {
-                               var setEnabled = function(d, enable) {
-                                       if(enable) {
-                                               d.css('cursor', 'default').find('input,button:not(#category_addbutton)')
-                                                       .prop('disabled', false).css('cursor', 'default');
-                                       } else {
-                                               d.css('cursor', 'wait').find('input,button:not(#category_addbutton)')
-                                                       .prop('disabled', true).css('cursor', 'wait');
-                                       }
-                               };
-                               var dlg = $('#edit_categories_dialog').dialog({
-                                               modal: true,
-                                               height: 350, minHeight:200, width: 250, minWidth: 200,
-                                               buttons: {
-                                                       'Close': function() {
-                                                               $(this).dialog('close');
-                                                       },
-                                                       'Delete':function() {
-                                                               var categories = $('#categorylist').find('input:checkbox').serialize();
-                                                               setEnabled(dlg, false);
-                                                               OCCategories.doDelete(categories, function() {
-                                                                       setEnabled(dlg, true);
-                                                               });
-                                                       },
-                                                       'Rescan':function() {
-                                                               setEnabled(dlg, false);
-                                                               OCCategories.rescan(function() {
-                                                                       setEnabled(dlg, true);
-                                                               });
-                                                       }
-                                               },
-                                               close : function(event, ui) {
-                                                       $(this).dialog('destroy').remove();
-                                                       $('#category_dialog').remove();
-                                               },
-                                               open : function(event, ui) {
-                                                       $('#category_addinput').on('input',function() {
-                                                               if($(this).val().length > 0) {
-                                                                       $('#category_addbutton').removeAttr('disabled');
-                                                               }
-                                                       });
-                                                       $('#categoryform').submit(function() {
-                                                               OCCategories.add($('#category_addinput').val());
-                                                               $('#category_addinput').val('');
-                                                               $('#category_addbutton').attr('disabled', 'disabled');
-                                                               return false;
-                                                       });
-                                                       $('#category_addbutton').on('click',function(e) {
-                                                               e.preventDefault();
-                                                               if($('#category_addinput').val().length > 0) {
-                                                                       OCCategories.add($('#category_addinput').val());
-                                                                       $('#category_addinput').val('');
-                                                               }
-                                                       });
-                                               }
-                               });
-                       }
-               });
-       },
-       _processDeleteResult:function(jsondata) {
-               if(jsondata.status == 'success') {
-                       OCCategories._update(jsondata.data.categories);
-               } else {
-                       OC.dialogs.alert(jsondata.data.message, t('core', 'Error'));
-               }
-       },
-       favorites:function(type, cb) {
-               if(!type && !this.type) {
-                       throw { name: 'MissingParameter', message: t('core', 'The object type is not specified.') };
-               }
-               type = type ? type : this.type;
-               $.getJSON(OC.filePath('core', 'ajax', 'categories/favorites.php'), {type: type},function(jsondata) {
-                       if(typeof cb == 'function') {
-                               cb(jsondata);
-                       } else {
-                               if(jsondata.status === 'success') {
-                                       OCCategories._update(jsondata.data.categories);
-                               } else {
-                                       OC.dialogs.alert(jsondata.data.message, t('core', 'Error'));
-                               }
-                       }
-               });
-       },
-       addToFavorites:function(id, type, cb) {
-               if(!type && !this.type) {
-                       throw { name: 'MissingParameter', message: t('core', 'The object type is not specified.') };
-               }
-               type = type ? type : this.type;
-               $.post(OC.filePath('core', 'ajax', 'vcategories/addToFavorites.php'), {id:id, type:type}, function(jsondata) {
-                       if(typeof cb == 'function') {
-                               cb(jsondata);
-                       } else {
-                               if(jsondata.status !== 'success') {
-                                       OC.dialogs.alert(jsondata.data.message, t('core', 'Error'));
-                               }
-                       }
-               });
-       },
-       removeFromFavorites:function(id, type, cb) {
-               if(!type && !this.type) {
-                       throw { name: 'MissingParameter', message: t('core', 'The object type is not specified.') };
-               }
-               type = type ? type : this.type;
-               $.post(OC.filePath('core', 'ajax', 'vcategories/removeFromFavorites.php'), {id:id, type:type}, function(jsondata) {
-                       if(typeof cb == 'function') {
-                               cb(jsondata);
-                       } else {
-                               if(jsondata.status !== 'success') {
-                                       OC.dialogs.alert(jsondata.data.message, t('core', 'Error'));
-                               }
-                       }
-               });
-       },
-       doDelete:function(categories, type, cb) {
-               if(!type && !this.type) {
-                       throw { name: 'MissingParameter', message: t('core', 'The object type is not specified.') };
-               }
-               type = type ? type : this.type;
-               if(categories == '' || categories == undefined) {
-                       OC.dialogs.alert(t('core', 'No categories selected for deletion.'), t('core', 'Error'));
-                       return false;
-               }
-               var self = this;
-               var q = categories + '&type=' + type;
-               if(this.app) {
-                       q += '&app=' + this.app;
-                       $.post(OC.filePath(this.app, 'ajax', 'categories/delete.php'), q, function(jsondata) {
-                               if(typeof cb == 'function') {
-                                       cb(jsondata);
-                               } else {
-                                       self._processDeleteResult(jsondata);
-                               }
-                       });
-               } else {
-                       $.post(OC.filePath('core', 'ajax', 'vcategories/delete.php'), q, function(jsondata) {
-                               if(typeof cb == 'function') {
-                                       cb(jsondata);
-                               } else {
-                                       self._processDeleteResult(jsondata);
-                               }
-                       });
-               }
-       },
-       add:function(category, type, cb) {
-               if(!type && !this.type) {
-                       throw { name: 'MissingParameter', message: t('core', 'The object type is not specified.') };
-               }
-               type = type ? type : this.type;
-               $.post(OC.filePath('core', 'ajax', 'vcategories/add.php'),{'category':category, 'type':type},function(jsondata) {
-                       if(typeof cb == 'function') {
-                               cb(jsondata);
-                       } else {
-                               if(jsondata.status === 'success') {
-                                       OCCategories._update(jsondata.data.categories);
-                               } else {
-                                       OC.dialogs.alert(jsondata.data.message, t('core', 'Error'));
-                               }
-                       }
-               });
-       },
-       rescan:function(app, cb) {
-               if(!app && !this.app) {
-                       throw { name: 'MissingParameter', message: t('core', 'The app name is not specified.') };
-               }
-               app = app ? app : this.app;
-               $.getJSON(OC.filePath(app, 'ajax', 'categories/rescan.php'),function(jsondata, status, xhr) {
-                       if(typeof cb == 'function') {
-                               cb(jsondata);
-                       } else {
-                               if(jsondata.status === 'success') {
-                                       OCCategories._update(jsondata.data.categories);
-                               } else {
-                                       OC.dialogs.alert(jsondata.data.message, t('core', 'Error'));
-                               }
-                       }
-               }).error(function(xhr){
-                       if (xhr.status == 404) {
-                               var errormessage = t('core', 'The required file {file} is not installed!',
-                                         {file: OC.filePath(app, 'ajax', 'categories/rescan.php')}, t('core', 'Error'));
-                               if(typeof cb == 'function') {
-                                       cb({status:'error', data:{message:errormessage}});
-                               } else {
-                                       OC.dialogs.alert(errormessage, t('core', 'Error'));
-                               }
-                       }
-               });
-       },
-       _update:function(categories) {
-               var categorylist = $('#categorylist');
-               categorylist.find('li').remove();
-               for(var category in categories) {
-                       var item = '<li><input type="checkbox" name="categories" value="' + categories[category] + '" />' + categories[category] + '</li>';
-                       $(item).appendTo(categorylist);
-               }
-               if(typeof OCCategories.changed === 'function') {
-                       OCCategories.changed(categories);
-               }
-       }
-}
-

diff --git a/core/js/oc-vcategories.txt b/core/js/oc-vcategories.txt
deleted file mode 100644 (file)
index 31216f8..0000000
--- a/core/js/oc-vcategories.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-Using OCCategories
-
-This 'class' is meant for any apps that uses OC_VObjects with the CATEGORIES field e.g.
-Contacts and Calendar. It provides an editor UI for adding/deleting and rescanning categories
-and basic ajax functions for adding and deleting.
-To use the mass updating of OC_VObjects that /lib/vcategories.php provides, the app must implement
-its own ajax functions in /apps/$(APP)/ajax/categories/rescan.php and /apps/$(APP)/ajax/categories/delete.php
-See examples in /apps/contacts/ajax/categories and the inline docs in /lib/vcategories.php.
-
-In your app make sure you load the script and stylesheet:
-
-OC_Util::addScript('','oc-vcategories');
-OC_Util::addStyle('','oc-vcategories');
-
-Set the app specific values in your javascript file. This is what I've used for the Contacts app:
-
-       OCCategories.app = 'contacts';
-       OCCategories.changed = Contacts.UI.Card.categoriesChanged;
-
-If OCCategories.changed is set that function will be called each time the categories have been changed
-in the editor (add/delete/rescan) to allow the app to update the UI accordingly. The only argument to the function
-is an array of the updated categories e.g.:
-
-OCCategories.changed = function(categories) {
-       for(var category in categories) {
-               console.log(categories[category]);
-       }
-}
-
-To show the categories editor call:
-
-       OCCategories.edit()
-

diff --git a/core/templates/edit_categories_dialog.php b/core/templates/edit_categories_dialog.php
deleted file mode 100644 (file)
index ea155bd..0000000
--- a/core/templates/edit_categories_dialog.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-$categories = isset($_['categories'])?$_['categories']:array();
-?>
-<div id="edit_categories_dialog" title="<?php p($l->t('Edit categories')); ?>">
-<!-- ?php print_r($types); ? -->
-       <form method="post" id="categoryform">
-       <div class="scrollarea">
-       <ul id="categorylist">
-       <?php foreach($categories as $category): ?>
-       <li><input type="checkbox" name="categories[]" value="<?php p($category); ?>" /><?php p($category); ?></li>
-       <?php endforeach; ?>
-       </ul>
-       </div>
-       <div class="bottombuttons">
-               <input type="text" id="category_addinput" name="category" />
-               <button id="category_addbutton" disabled="disabled"><?php p($l->t('Add')); ?></button>
-       </div>
-       </form>
-</div>