diff options
46 files changed, 131 insertions, 124 deletions
diff --git a/apps/bookmarks/lib/bookmarks.php b/apps/bookmarks/lib/bookmarks.php index 81c1b03981a..b1ff1f411f2 100644..100755 --- a/apps/bookmarks/lib/bookmarks.php +++ b/apps/bookmarks/lib/bookmarks.php @@ -34,7 +34,7 @@ class OC_Bookmarks_Bookmarks{ * @return void */ public static function findBookmarks($offset, $sqlSortColumn, $filter, $filterTagOnly){ - //OC_Log::write('bookmarks', 'findBookmarks ' .$offset. ' '.$sqlSortColumn.' '. $filter.' '. $filterTagOnly ,OC_Log::DEBUG); + //OCP\Util::writeLog('bookmarks', 'findBookmarks ' .$offset. ' '.$sqlSortColumn.' '. $filter.' '. $filterTagOnly ,OCP\Util::DEBUG); $CONFIG_DBTYPE = OC_Config::getValue( 'dbtype', 'sqlite' ); $params=array(OC_User::getUser()); diff --git a/apps/bookmarks/lib/search.php b/apps/bookmarks/lib/search.php index d7e32558617..1e6a3ce910b 100644..100755 --- a/apps/bookmarks/lib/search.php +++ b/apps/bookmarks/lib/search.php @@ -34,9 +34,9 @@ class OC_Search_Provider_Bookmarks extends OC_Search_Provider{ $searchquery = $query; } -// OC_Log::write('bookmarks', 'search ' .$query ,OC_Log::DEBUG); +// OCP\Util::writeLog('bookmarks', 'search ' .$query ,OCP\Util::DEBUG); $bookmarks = OC_Bookmarks_Bookmarks::findBookmarks($offset, $sqlSortColumn, $searchquery, false); -// OC_Log::write('bookmarks', 'found ' .count($bookmarks) ,OC_Log::DEBUG); +// OCP\Util::writeLog('bookmarks', 'found ' .count($bookmarks) ,OCP\Util::DEBUG); //$l = new OC_l10n('bookmarks'); //resulttype can't be localized, javascript relies on that type foreach($bookmarks as $bookmark){ $results[]=new OC_Search_Result($bookmark['title'],'', $bookmark['url'],'Bookm.'); diff --git a/apps/calendar/ajax/categories/rescan.php b/apps/calendar/ajax/categories/rescan.php index 9273986cad4..e1b276312a5 100644..100755 --- a/apps/calendar/ajax/categories/rescan.php +++ b/apps/calendar/ajax/categories/rescan.php @@ -16,11 +16,11 @@ foreach ($_POST as $key=>$element) { function bailOut($msg) { OC_JSON::error(array('data' => array('message' => $msg))); - OC_Log::write('calendar','ajax/categories/rescan.php: '.$msg, OC_Log::DEBUG); + OCP\Util::writeLog('calendar','ajax/categories/rescan.php: '.$msg, OCP\Util::DEBUG); exit(); } function debug($msg) { - OC_Log::write('calendar','ajax/categories/rescan.php: '.$msg, OC_Log::DEBUG); + OCP\Util::writeLog('calendar','ajax/categories/rescan.php: '.$msg, OCP\Util::DEBUG); } $calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser()); diff --git a/apps/contacts/ajax/activation.php b/apps/contacts/ajax/activation.php index 06d1a7e24fc..b45d1a6ccbe 100644..100755 --- a/apps/contacts/ajax/activation.php +++ b/apps/contacts/ajax/activation.php @@ -15,7 +15,7 @@ $bookid = $_POST['bookid']; $book = OC_Contacts_App::getAddressbook($bookid);// is owner access check if(!OC_Contacts_Addressbook::setActive($bookid, $_POST['active'])) { - OC_Log::write('contacts','ajax/activation.php: Error activating addressbook: '.$bookid, OC_Log::ERROR); + OCP\Util::writeLog('contacts','ajax/activation.php: Error activating addressbook: '.$bookid, OCP\Util::ERROR); OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error (de)activating addressbook.')))); exit(); } diff --git a/apps/contacts/ajax/addcontact.php b/apps/contacts/ajax/addcontact.php index 152277181bb..d87cbabe819 100644..100755 --- a/apps/contacts/ajax/addcontact.php +++ b/apps/contacts/ajax/addcontact.php @@ -24,11 +24,11 @@ function bailOut($msg) { OC_JSON::error(array('data' => array('message' => $msg))); - OC_Log::write('contacts','ajax/addcontact.php: '.$msg, OC_Log::DEBUG); + OCP\Util::writeLog('contacts','ajax/addcontact.php: '.$msg, OCP\Util::DEBUG); exit(); } function debug($msg) { - OC_Log::write('contacts','ajax/addcontact.php: '.$msg, OC_Log::DEBUG); + OCP\Util::writeLog('contacts','ajax/addcontact.php: '.$msg, OCP\Util::DEBUG); } // Check if we are a user @@ -56,7 +56,7 @@ $vcard->setString('N',$n); $id = OC_Contacts_VCard::add($aid,$vcard); if(!$id) { OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('There was an error adding the contact.')))); - OC_Log::write('contacts','ajax/addcontact.php: Recieved non-positive ID on adding card: '.$id, OC_Log::ERROR); + OCP\Util::writeLog('contacts','ajax/addcontact.php: Recieved non-positive ID on adding card: '.$id, OCP\Util::ERROR); exit(); } diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php index 9a5e59692d6..8623c6fdca7 100644..100755 --- a/apps/contacts/ajax/addproperty.php +++ b/apps/contacts/ajax/addproperty.php @@ -60,7 +60,7 @@ foreach($current as $item) { $tmpvalue = (is_array($value)?implode(';', $value):$value); if($tmpvalue == $item->value) { OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Trying to add duplicate property: ').$name.': '.$tmpvalue))); - OC_Log::write('contacts','ajax/addproperty.php: Trying to add duplicate property: '.$name.': '.$tmpvalue, OC_Log::DEBUG); + OCP\Util::writeLog('contacts','ajax/addproperty.php: Trying to add duplicate property: '.$name.': '.$tmpvalue, OCP\Util::DEBUG); exit(); } } @@ -118,7 +118,7 @@ $checksum = md5($vcard->children[$line]->serialize()); if(!OC_Contacts_VCard::edit($id,$vcard)) { OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error adding contact property.')))); - OC_Log::write('contacts','ajax/addproperty.php: Error updating contact property: '.$name, OC_Log::ERROR); + OCP\Util::writeLog('contacts','ajax/addproperty.php: Error updating contact property: '.$name, OCP\Util::ERROR); exit(); } diff --git a/apps/contacts/ajax/categories/categoriesfor.php b/apps/contacts/ajax/categories/categoriesfor.php index 39a7758c8fb..c6b753a73b5 100644..100755 --- a/apps/contacts/ajax/categories/categoriesfor.php +++ b/apps/contacts/ajax/categories/categoriesfor.php @@ -17,7 +17,7 @@ if(is_null($id)) { } $vcard = OC_Contacts_App::getContactVCard( $id ); foreach($vcard->children as $property){ - //OC_Log::write('contacts','ajax/categories/checksumfor.php: '.$property->name, OC_Log::DEBUG); + //OCP\Util::writeLog('contacts','ajax/categories/checksumfor.php: '.$property->name, OCP\Util::DEBUG); if($property->name == 'CATEGORIES') { $checksum = md5($property->serialize()); OC_JSON::success(array('data' => array('value'=>$property->value, 'checksum'=>$checksum))); diff --git a/apps/contacts/ajax/categories/delete.php b/apps/contacts/ajax/categories/delete.php index 3cc2dea6638..f4e7ba76aa9 100644..100755 --- a/apps/contacts/ajax/categories/delete.php +++ b/apps/contacts/ajax/categories/delete.php @@ -16,11 +16,11 @@ foreach ($_POST as $key=>$element) { function bailOut($msg) { OC_JSON::error(array('data' => array('message' => $msg))); - OC_Log::write('contacts','ajax/categories/delete.php: '.$msg, OC_Log::DEBUG); + OCP\Util::writeLog('contacts','ajax/categories/delete.php: '.$msg, OCP\Util::DEBUG); exit(); } function debug($msg) { - OC_Log::write('contacts','ajax/categories/delete.php: '.$msg, OC_Log::DEBUG); + OCP\Util::writeLog('contacts','ajax/categories/delete.php: '.$msg, OCP\Util::DEBUG); } $categories = isset($_POST['categories'])?$_POST['categories']:null; diff --git a/apps/contacts/ajax/categories/rescan.php b/apps/contacts/ajax/categories/rescan.php index 09208c3f685..97fd1b22fea 100644..100755 --- a/apps/contacts/ajax/categories/rescan.php +++ b/apps/contacts/ajax/categories/rescan.php @@ -16,11 +16,11 @@ foreach ($_POST as $key=>$element) { function bailOut($msg) { OC_JSON::error(array('data' => array('message' => $msg))); - OC_Log::write('contacts','ajax/categories/rescan.php: '.$msg, OC_Log::DEBUG); + OCP\Util::writeLog('contacts','ajax/categories/rescan.php: '.$msg, OCP\Util::DEBUG); exit(); } function debug($msg) { - OC_Log::write('contacts','ajax/categories/rescan.php: '.$msg, OC_Log::DEBUG); + OCP\Util::writeLog('contacts','ajax/categories/rescan.php: '.$msg, OCP\Util::DEBUG); } $addressbooks = OC_Contacts_Addressbook::all(OC_User::getUser()); diff --git a/apps/contacts/ajax/contactdetails.php b/apps/contacts/ajax/contactdetails.php index 87c2ecbcdad..aa6aca4562a 100644..100755 --- a/apps/contacts/ajax/contactdetails.php +++ b/apps/contacts/ajax/contactdetails.php @@ -24,7 +24,7 @@ function bailOut($msg) { OC_JSON::error(array('data' => array('message' => $msg))); - OC_Log::write('contacts','ajax/contactdetails.php: '.$msg, OC_Log::DEBUG); + OCP\Util::writeLog('contacts','ajax/contactdetails.php: '.$msg, OCP\Util::DEBUG); exit(); } diff --git a/apps/contacts/ajax/createaddressbook.php b/apps/contacts/ajax/createaddressbook.php index 5cdb9b49ef8..6c9976f6fa3 100644..100755 --- a/apps/contacts/ajax/createaddressbook.php +++ b/apps/contacts/ajax/createaddressbook.php @@ -16,19 +16,19 @@ $userid = OC_User::getUser(); $name = trim(strip_tags($_POST['name'])); if(!$name) { OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Cannot add addressbook with an empty name.')))); - OC_Log::write('contacts','ajax/createaddressbook.php: Cannot add addressbook with an empty name: '.strip_tags($_POST['name']), OC_Log::ERROR); + OCP\Util::writeLog('contacts','ajax/createaddressbook.php: Cannot add addressbook with an empty name: '.strip_tags($_POST['name']), OCP\Util::ERROR); exit(); } $bookid = OC_Contacts_Addressbook::add($userid, $name, null); if(!$bookid) { OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error adding addressbook.')))); - OC_Log::write('contacts','ajax/createaddressbook.php: Error adding addressbook: '.$_POST['name'], OC_Log::ERROR); + OCP\Util::writeLog('contacts','ajax/createaddressbook.php: Error adding addressbook: '.$_POST['name'], OCP\Util::ERROR); exit(); } if(!OC_Contacts_Addressbook::setActive($bookid, 1)) { OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error activating addressbook.')))); - OC_Log::write('contacts','ajax/createaddressbook.php: Error activating addressbook: '.$bookid, OC_Log::ERROR); + OCP\Util::writeLog('contacts','ajax/createaddressbook.php: Error activating addressbook: '.$bookid, OCP\Util::ERROR); //exit(); } $addressbook = OC_Contacts_App::getAddressbook($bookid); diff --git a/apps/contacts/ajax/cropphoto.php b/apps/contacts/ajax/cropphoto.php index 96e66ffb69c..09bdbbc439a 100644..100755 --- a/apps/contacts/ajax/cropphoto.php +++ b/apps/contacts/ajax/cropphoto.php @@ -29,7 +29,7 @@ OC_JSON::checkAppEnabled('contacts'); $tmp_path = $_GET['tmp_path']; $id = $_GET['id']; -OC_Log::write('contacts','ajax/cropphoto.php: tmp_path: '.$tmp_path.', exists: '.file_exists($tmp_path), OC_Log::DEBUG); +OCP\Util::writeLog('contacts','ajax/cropphoto.php: tmp_path: '.$tmp_path.', exists: '.file_exists($tmp_path), OCP\Util::DEBUG); $tmpl = new OC_TEMPLATE("contacts", "part.cropphoto"); $tmpl->assign('tmp_path', $tmp_path); $tmpl->assign('id', $id); diff --git a/apps/contacts/ajax/currentphoto.php b/apps/contacts/ajax/currentphoto.php index 171f5c34785..488f064836b 100644..100755 --- a/apps/contacts/ajax/currentphoto.php +++ b/apps/contacts/ajax/currentphoto.php @@ -29,11 +29,11 @@ OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('contacts'); function bailOut($msg) { OC_JSON::error(array('data' => array('message' => $msg))); - OC_Log::write('contacts','ajax/currentphoto.php: '.$msg, OC_Log::ERROR); + OCP\Util::writeLog('contacts','ajax/currentphoto.php: '.$msg, OCP\Util::ERROR); exit(); } function debug($msg) { - OC_Log::write('contacts','ajax/currentphoto.php: '.$msg, OC_Log::DEBUG); + OCP\Util::writeLog('contacts','ajax/currentphoto.php: '.$msg, OCP\Util::DEBUG); } if (!isset($_GET['id'])) { diff --git a/apps/contacts/ajax/deletecard.php b/apps/contacts/ajax/deletecard.php index 98cdb85f0fc..84526e9b13b 100644..100755 --- a/apps/contacts/ajax/deletecard.php +++ b/apps/contacts/ajax/deletecard.php @@ -21,7 +21,7 @@ */ function bailOut($msg) { OC_JSON::error(array('data' => array('message' => $msg))); - OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG); + OCP\Util::writeLog('contacts','ajax/saveproperty.php: '.$msg, OCP\Util::DEBUG); exit(); } diff --git a/apps/contacts/ajax/deleteproperty.php b/apps/contacts/ajax/deleteproperty.php index 73786cb10cf..4c753816218 100644..100755 --- a/apps/contacts/ajax/deleteproperty.php +++ b/apps/contacts/ajax/deleteproperty.php @@ -41,7 +41,7 @@ unset($vcard->children[$line]); if(!OC_Contacts_VCard::edit($id,$vcard)) { OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Error deleting contact property.')))); - OC_Log::write('contacts','ajax/deleteproperty.php: Error deleting contact property', OC_Log::ERROR); + OCP\Util::writeLog('contacts','ajax/deleteproperty.php: Error deleting contact property', OCP\Util::ERROR); exit(); } diff --git a/apps/contacts/ajax/editname.php b/apps/contacts/ajax/editname.php index 9e4d6814620..0baa9403524 100644..100755 --- a/apps/contacts/ajax/editname.php +++ b/apps/contacts/ajax/editname.php @@ -11,11 +11,11 @@ OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('contacts'); function bailOut($msg) { OC_JSON::error(array('data' => array('message' => $msg))); - OC_Log::write('contacts','ajax/editname.php: '.$msg, OC_Log::DEBUG); + OCP\Util::writeLog('contacts','ajax/editname.php: '.$msg, OCP\Util::DEBUG); exit(); } function debug($msg) { - OC_Log::write('contacts','ajax/editname.php: '.$msg, OC_Log::DEBUG); + OCP\Util::writeLog('contacts','ajax/editname.php: '.$msg, OCP\Util::DEBUG); } $tmpl = new OC_TEMPLATE("contacts", "part.edit_name_dialog"); diff --git a/apps/contacts/ajax/loadcard.php b/apps/contacts/ajax/loadcard.php index b2650a76f0e..a2660130a25 100644..100755 --- a/apps/contacts/ajax/loadcard.php +++ b/apps/contacts/ajax/loadcard.php @@ -24,11 +24,11 @@ function bailOut($msg) { OC_JSON::error(array('data' => array('message' => $msg))); - OC_Log::write('contacts','ajax/loadcard.php: '.$msg, OC_Log::DEBUG); + OCP\Util::writeLog('contacts','ajax/loadcard.php: '.$msg, OCP\Util::DEBUG); exit(); } function debug($msg) { - OC_Log::write('contacts','ajax/loadcard.php: '.$msg, OC_Log::DEBUG); + OCP\Util::writeLog('contacts','ajax/loadcard.php: '.$msg, OCP\Util::DEBUG); } // foreach ($_POST as $key=>$element) { // debug('_POST: '.$key.'=>'.$element); diff --git a/apps/contacts/ajax/loadphoto.php b/apps/contacts/ajax/loadphoto.php index c076d97a7c2..8d40669a5b3 100644..100755 --- a/apps/contacts/ajax/loadphoto.php +++ b/apps/contacts/ajax/loadphoto.php @@ -26,12 +26,12 @@ OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('contacts'); // foreach ($_POST as $key=>$element) { -// OC_Log::write('contacts','ajax/savecrop.php: '.$key.'=>'.$element, OC_Log::DEBUG); +// OCP\Util::writeLog('contacts','ajax/savecrop.php: '.$key.'=>'.$element, OCP\Util::DEBUG); // } function bailOut($msg) { OC_JSON::error(array('data' => array('message' => $msg))); - OC_Log::write('contacts','ajax/loadphoto.php: '.$msg, OC_Log::DEBUG); + OCP\Util::writeLog('contacts','ajax/loadphoto.php: '.$msg, OCP\Util::DEBUG); exit(); } diff --git a/apps/contacts/ajax/oc_photo.php b/apps/contacts/ajax/oc_photo.php index e46441c4821..8c6b95c5563 100644..100755 --- a/apps/contacts/ajax/oc_photo.php +++ b/apps/contacts/ajax/oc_photo.php @@ -29,11 +29,11 @@ OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('contacts'); function bailOut($msg) { OC_JSON::error(array('data' => array('message' => $msg))); - OC_Log::write('contacts','ajax/oc_photo.php: '.$msg, OC_Log::ERROR); + OCP\Util::writeLog('contacts','ajax/oc_photo.php: '.$msg, OCP\Util::ERROR); exit(); } function debug($msg) { - OC_Log::write('contacts','ajax/oc_photo.php: '.$msg, OC_Log::DEBUG); + OCP\Util::writeLog('contacts','ajax/oc_photo.php: '.$msg, OCP\Util::DEBUG); } if(!isset($_GET['id'])) { diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php index c1a0e2b0583..36d582eca9c 100644..100755 --- a/apps/contacts/ajax/savecrop.php +++ b/apps/contacts/ajax/savecrop.php @@ -23,14 +23,14 @@ */ // Init owncloud -OC_Log::write('contacts','ajax/savecrop.php: Huzzah!!!', OC_Log::DEBUG); +OCP\Util::writeLog('contacts','ajax/savecrop.php: Huzzah!!!', OCP\Util::DEBUG); // Check if we are a user OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('contacts'); // foreach ($_POST as $key=>$element) { -// OC_Log::write('contacts','ajax/savecrop.php: '.$key.'=>'.$element, OC_Log::DEBUG); +// OCP\Util::writeLog('contacts','ajax/savecrop.php: '.$key.'=>'.$element, OCP\Util::DEBUG); // } // Firefox and Konqueror tries to download application/json for me. --Arthur @@ -38,7 +38,7 @@ OC_JSON::setContentTypeHeader('text/plain'); function bailOut($msg) { OC_JSON::error(array('data' => array('message' => $msg))); - OC_Log::write('contacts','ajax/savecrop.php: '.$msg, OC_Log::DEBUG); + OCP\Util::writeLog('contacts','ajax/savecrop.php: '.$msg, OCP\Util::DEBUG); exit(); } @@ -61,14 +61,14 @@ if($id == '') { bailOut('Missing contact id.'); } -OC_Log::write('contacts','savecrop.php: files: '.$tmp_path.' exists: '.file_exists($tmp_path), OC_Log::DEBUG); +OCP\Util::writeLog('contacts','savecrop.php: files: '.$tmp_path.' exists: '.file_exists($tmp_path), OCP\Util::DEBUG); if(file_exists($tmp_path)) { $image = new OC_Image(); if($image->loadFromFile($tmp_path)) { $w = ($w != -1 ? $w : $image->width()); $h = ($h != -1 ? $h : $image->height()); - OC_Log::write('contacts','savecrop.php, x: '.$x1.' y: '.$y1.' w: '.$w.' h: '.$h, OC_Log::DEBUG); + OCP\Util::writeLog('contacts','savecrop.php, x: '.$x1.' y: '.$y1.' w: '.$w.' h: '.$h, OCP\Util::DEBUG); if($image->crop($x1, $y1, $w, $h)) { if($image->resize(200)) { $tmpfname = tempnam("/tmp", "occCropped"); // create a new file because of caching issues. @@ -80,7 +80,7 @@ if(file_exists($tmp_path)) { bailOut('Error getting contact object.'); } if($card->__isset('PHOTO')) { - OC_Log::write('contacts','savecrop.php: PHOTO property exists.', OC_Log::DEBUG); + OCP\Util::writeLog('contacts','savecrop.php: PHOTO property exists.', OCP\Util::DEBUG); $property = $card->__get('PHOTO'); if(!$property) { unlink($tmpfname); @@ -91,7 +91,7 @@ if(file_exists($tmp_path)) { $property->parameters[] = new Sabre_VObject_Parameter('TYPE', $image->mimeType()); $card->__set('PHOTO', $property); } else { - OC_Log::write('contacts','savecrop.php: files: Adding PHOTO property.', OC_Log::DEBUG); + OCP\Util::writeLog('contacts','savecrop.php: files: Adding PHOTO property.', OCP\Util::DEBUG); $card->addProperty('PHOTO', $image->__toString(), array('ENCODING' => 'b', 'TYPE' => $image->mimeType())); } $now = new DateTime; diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php index e459ed733d8..b8b4a422cf2 100644..100755 --- a/apps/contacts/ajax/saveproperty.php +++ b/apps/contacts/ajax/saveproperty.php @@ -29,11 +29,11 @@ OC_JSON::checkAppEnabled('contacts'); function bailOut($msg) { OC_JSON::error(array('data' => array('message' => $msg))); - OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG); + OCP\Util::writeLog('contacts','ajax/saveproperty.php: '.$msg, OCP\Util::DEBUG); exit(); } function debug($msg) { - OC_Log::write('contacts','ajax/saveproperty.php: '.$msg, OC_Log::DEBUG); + OCP\Util::writeLog('contacts','ajax/saveproperty.php: '.$msg, OCP\Util::DEBUG); } // foreach ($_POST as $key=>$element) { // debug('_POST: '.$key.'=>'.print_r($element, true)); diff --git a/apps/contacts/ajax/updateaddressbook.php b/apps/contacts/ajax/updateaddressbook.php index 06028db479a..b016cf92939 100644..100755 --- a/apps/contacts/ajax/updateaddressbook.php +++ b/apps/contacts/ajax/updateaddressbook.php @@ -18,19 +18,19 @@ OC_Contacts_App::getAddressbook($bookid); // is owner access check $name = trim(strip_tags($_POST['name'])); if(!$name) { OC_JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Cannot update addressbook with an empty name.')))); - OC_Log::write('contacts','ajax/updateaddressbook.php: Cannot update addressbook with an empty name: '.strip_tags($_POST['name']), OC_Log::ERROR); + OCP\Util::writeLog('contacts','ajax/updateaddressbook.php: Cannot update addressbook with an empty name: '.strip_tags($_POST['name']), OCP\Util::ERROR); exit(); } if(!OC_Contacts_Addressbook::edit($bookid, $name, null)) { OC_JSON::error(array('data' => array('message' => $l->t('Error updating addressbook.')))); - OC_Log::write('contacts','ajax/updateaddressbook.php: Error adding addressbook: ', OC_Log::ERROR); + OCP\Util::writeLog('contacts','ajax/updateaddressbook.php: Error adding addressbook: ', OCP\Util::ERROR); //exit(); } if(!OC_Contacts_Addressbook::setActive($bookid, $_POST['active'])) { OC_JSON::error(array('data' => array('message' => $l->t('Error (de)activating addressbook.')))); - OC_Log::write('contacts','ajax/updateaddressbook.php: Error (de)activating addressbook: '.$bookid, OC_Log::ERROR); + OCP\Util::writeLog('contacts','ajax/updateaddressbook.php: Error (de)activating addressbook: '.$bookid, OCP\Util::ERROR); //exit(); } diff --git a/apps/contacts/ajax/uploadimport.php b/apps/contacts/ajax/uploadimport.php index f44335a961e..e2bc6d7290b 100644..100755 --- a/apps/contacts/ajax/uploadimport.php +++ b/apps/contacts/ajax/uploadimport.php @@ -27,11 +27,11 @@ OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('contacts'); function bailOut($msg) { OC_JSON::error(array('data' => array('message' => $msg))); - OC_Log::write('contacts','ajax/uploadimport.php: '.$msg, OC_Log::ERROR); + OCP\Util::writeLog('contacts','ajax/uploadimport.php: '.$msg, OCP\Util::ERROR); exit(); } function debug($msg) { - OC_Log::write('contacts','ajax/uploadimport.php: '.$msg, OC_Log::DEBUG); + OCP\Util::writeLog('contacts','ajax/uploadimport.php: '.$msg, OCP\Util::DEBUG); } $view = OC_App::getStorage('contacts'); @@ -51,7 +51,7 @@ if($fn) { // File input transfers are handled here if (!isset($_FILES['importfile'])) { - OC_Log::write('contacts','ajax/uploadphoto.php: No file was uploaded. Unknown error.', OC_Log::DEBUG); + OCP\Util::writeLog('contacts','ajax/uploadphoto.php: No file was uploaded. Unknown error.', OCP\Util::DEBUG); OC_JSON::error(array('data' => array( 'message' => 'No file was uploaded. Unknown error' ))); exit(); } diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php index 082776f7f27..1148c271dcd 100644..100755 --- a/apps/contacts/ajax/uploadphoto.php +++ b/apps/contacts/ajax/uploadphoto.php @@ -29,11 +29,11 @@ OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('contacts'); function bailOut($msg) { OC_JSON::error(array('data' => array('message' => $msg))); - OC_Log::write('contacts','ajax/uploadphoto.php: '.$msg, OC_Log::DEBUG); + OCP\Util::writeLog('contacts','ajax/uploadphoto.php: '.$msg, OCP\Util::DEBUG); exit(); } function debug($msg) { - OC_Log::write('contacts','ajax/uploadphoto.php: '.$msg, OC_Log::DEBUG); + OCP\Util::writeLog('contacts','ajax/uploadphoto.php: '.$msg, OCP\Util::DEBUG); } // If it is a Drag'n'Drop transfer it's handled here. @@ -41,7 +41,7 @@ $fn = (isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : fals if ($fn) { // AJAX call if (!isset($_GET['id'])) { - OC_Log::write('contacts','ajax/uploadphoto.php: No contact ID was submitted.', OC_Log::DEBUG); + OCP\Util::writeLog('contacts','ajax/uploadphoto.php: No contact ID was submitted.', OCP\Util::DEBUG); OC_JSON::error(array('data' => array( 'message' => 'No contact ID was submitted.' ))); exit(); } @@ -70,12 +70,12 @@ if ($fn) { if (!isset($_POST['id'])) { - OC_Log::write('contacts','ajax/uploadphoto.php: No contact ID was submitted.', OC_Log::DEBUG); + OCP\Util::writeLog('contacts','ajax/uploadphoto.php: No contact ID was submitted.', OCP\Util::DEBUG); OC_JSON::error(array('data' => array( 'message' => 'No contact ID was submitted.' ))); exit(); } if (!isset($_FILES['imagefile'])) { - OC_Log::write('contacts','ajax/uploadphoto.php: No file was uploaded. Unknown error.', OC_Log::DEBUG); + OCP\Util::writeLog('contacts','ajax/uploadphoto.php: No file was uploaded. Unknown error.', OCP\Util::DEBUG); OC_JSON::error(array('data' => array( 'message' => 'No file was uploaded. Unknown error' ))); exit(); } diff --git a/apps/contacts/dynphoto.php b/apps/contacts/dynphoto.php index c1646e483de..ea6cef227e1 100644..100755 --- a/apps/contacts/dynphoto.php +++ b/apps/contacts/dynphoto.php @@ -26,7 +26,7 @@ $tmp_path = $_GET['tmp_path']; $maxsize = isset($_GET['maxsize']) ? $_GET['maxsize'] : -1; header("Cache-Control: no-cache, no-store, must-revalidate"); -OC_Log::write('contacts','dynphoto.php: tmp_path: '.$tmp_path.', exists: '.file_exists($tmp_path), OC_Log::DEBUG); +OCP\Util::writeLog('contacts','dynphoto.php: tmp_path: '.$tmp_path.', exists: '.file_exists($tmp_path), OCP\Util::DEBUG); $image = new OC_Image($tmp_path); if($maxsize != -1) { diff --git a/apps/contacts/import.php b/apps/contacts/import.php index 8e0a427399b..8fb1c055e0f 100644..100755 --- a/apps/contacts/import.php +++ b/apps/contacts/import.php @@ -116,7 +116,7 @@ foreach($importready as $import){ $card = OC_VObject::parse($import); if (!$card) { $failed += 1; - OC_Log::write('contacts','Import: skipping card. Error parsing VCard: '.$import, OC_Log::ERROR); + OCP\Util::writeLog('contacts','Import: skipping card. Error parsing VCard: '.$import, OCP\Util::ERROR); continue; // Ditch cards that can't be parsed by Sabre. } $imported += 1; @@ -134,7 +134,7 @@ if(is_writable('import_tmp/')){ } if(isset($_POST['fstype']) && $_POST['fstype'] == 'OC_FilesystemView') { if(!$view->unlink('/' . $_POST['file'])) { - OC_Log::write('contacts','Import: Error unlinking OC_FilesystemView ' . '/' . $_POST['file'], OC_Log::ERROR); + OCP\Util::writeLog('contacts','Import: Error unlinking OC_FilesystemView ' . '/' . $_POST['file'], OCP\Util::ERROR); } } OC_JSON::success(array('data' => array('imported'=>$imported, 'failed'=>$failed))); diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php index 9061fa19140..bf1cb9323db 100644..100755 --- a/apps/contacts/lib/addressbook.php +++ b/apps/contacts/lib/addressbook.php @@ -195,9 +195,9 @@ class OC_Contacts_Addressbook{ $stmt = OC_DB::prepare( $prep ); $result = $stmt->execute($active); } catch(Exception $e) { - OC_Log::write('contacts','OC_Contacts_Addressbook:active:, exception: '.$e->getMessage(),OC_Log::DEBUG); - OC_Log::write('contacts','OC_Contacts_Addressbook:active, ids: '.join(',', $active),OC_Log::DEBUG); - OC_Log::write('contacts','OC_Contacts_Addressbook::active, SQL:'.$prep,OC_Log::DEBUG); + OCP\Util::writeLog('contacts','OC_Contacts_Addressbook:active:, exception: '.$e->getMessage(),OCP\Util::DEBUG); + OCP\Util::writeLog('contacts','OC_Contacts_Addressbook:active, ids: '.join(',', $active),OCP\Util::DEBUG); + OCP\Util::writeLog('contacts','OC_Contacts_Addressbook::active, SQL:'.$prep,OCP\Util::DEBUG); } while( $row = $result->fetchRow()){ @@ -246,7 +246,7 @@ class OC_Contacts_Addressbook{ * @return boolean */ public static function isActive($id){ - //OC_Log::write('contacts','OC_Contacts_Addressbook::isActive('.$id.'):'.in_array($id, self::activeIds()), OC_Log::DEBUG); + //OCP\Util::writeLog('contacts','OC_Contacts_Addressbook::isActive('.$id.'):'.in_array($id, self::activeIds()), OCP\Util::DEBUG); return in_array($id, self::activeIds()); } diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php index 128b9cd660d..26ea6d06092 100644..100755 --- a/apps/contacts/lib/app.php +++ b/apps/contacts/lib/app.php @@ -19,11 +19,11 @@ class OC_Contacts_App { $addressbook = OC_Contacts_Addressbook::find( $id ); if( $addressbook === false || $addressbook['userid'] != OC_User::getUser()) { if ($addressbook === false) { - OC_Log::write('contacts', 'Addressbook not found: '. $id, OC_Log::ERROR); + OCP\Util::writeLog('contacts', 'Addressbook not found: '. $id, OCP\Util::ERROR); OC_JSON::error(array('data' => array( 'message' => self::$l10n->t('Addressbook not found.')))); } else { - OC_Log::write('contacts', 'Addressbook('.$id.') is not from '.OC_User::getUser(), OC_Log::ERROR); + OCP\Util::writeLog('contacts', 'Addressbook('.$id.') is not from '.OC_User::getUser(), OCP\Util::ERROR); OC_JSON::error(array('data' => array( 'message' => self::$l10n->t('This is not your addressbook.')))); } exit(); @@ -34,7 +34,7 @@ class OC_Contacts_App { public static function getContactObject($id) { $card = OC_Contacts_VCard::find( $id ); if( $card === false ) { - OC_Log::write('contacts', 'Contact could not be found: '.$id, OC_Log::ERROR); + OCP\Util::writeLog('contacts', 'Contact could not be found: '.$id, OCP\Util::ERROR); OC_JSON::error(array('data' => array( 'message' => self::$l10n->t('Contact could not be found.').' '.$id))); exit(); } @@ -55,11 +55,11 @@ class OC_Contacts_App { if(!is_null($vcard) && !$vcard->__isset('N')) { $appinfo = OC_App::getAppInfo('contacts'); if($appinfo['version'] >= 5) { - OC_Log::write('contacts','OC_Contacts_App::getContactVCard. Deprecated check for missing N field', OC_Log::DEBUG); + OCP\Util::writeLog('contacts','OC_Contacts_App::getContactVCard. Deprecated check for missing N field', OCP\Util::DEBUG); } - OC_Log::write('contacts','getContactVCard, Missing N field', OC_Log::DEBUG); + OCP\Util::writeLog('contacts','getContactVCard, Missing N field', OCP\Util::DEBUG); if($vcard->__isset('FN')) { - OC_Log::write('contacts','getContactVCard, found FN field: '.$vcard->__get('FN'), OC_Log::DEBUG); + OCP\Util::writeLog('contacts','getContactVCard, found FN field: '.$vcard->__get('FN'), OCP\Util::DEBUG); $n = implode(';', array_reverse(array_slice(explode(' ', $vcard->__get('FN')), 0, 2))).';;;'; $vcard->setString('N', $n); OC_Contacts_VCard::edit( $id, $vcard); diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php index d8cce36b80b..45ce1ac3a2c 100644..100755 --- a/apps/contacts/lib/vcard.php +++ b/apps/contacts/lib/vcard.php @@ -56,17 +56,17 @@ class OC_Contacts_VCard{ $stmt = OC_DB::prepare( $prep ); $result = $stmt->execute($id); } catch(Exception $e) { - OC_Log::write('contacts','OC_Contacts_VCard:all:, exception: '.$e->getMessage(),OC_Log::DEBUG); - OC_Log::write('contacts','OC_Contacts_VCard:all, ids: '.join(',', $id),OC_Log::DEBUG); - OC_Log::write('contacts','SQL:'.$prep,OC_Log::DEBUG); + OCP\Util::writeLog('contacts','OC_Contacts_VCard:all:, exception: '.$e->getMessage(),OCP\Util::DEBUG); + OCP\Util::writeLog('contacts','OC_Contacts_VCard:all, ids: '.join(',', $id),OCP\Util::DEBUG); + OCP\Util::writeLog('contacts','SQL:'.$prep,OCP\Util::DEBUG); } } elseif($id) { try { $stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid = ? ORDER BY fullname' ); $result = $stmt->execute(array($id)); } catch(Exception $e) { - OC_Log::write('contacts','OC_Contacts_VCard:all:, exception: '.$e->getMessage(),OC_Log::DEBUG); - OC_Log::write('contacts','OC_Contacts_VCard:all, ids: '. $id,OC_Log::DEBUG); + OC\Util::writeLog('contacts','OC_Contacts_VCard:all:, exception: '.$e->getMessage(),OCP\Util::DEBUG); + OC\Util::writeLog('contacts','OC_Contacts_VCard:all, ids: '. $id,OCP\Util::DEBUG); } } $cards = array(); @@ -181,7 +181,7 @@ class OC_Contacts_VCard{ // Add version if needed if($version && $version < '3.0') { $upgrade = true; - OC_Log::write('contacts','OC_Contacts_VCard::updateValuesFromAdd. Updating from version: '.$version,OC_Log::DEBUG); + OCP\Util::writeLog('contacts','OC_Contacts_VCard::updateValuesFromAdd. Updating from version: '.$version,OCP\Util::DEBUG); } foreach($vcard->children as &$property){ // Decode string properties and remove obsolete properties. @@ -190,9 +190,9 @@ class OC_Contacts_VCard{ } // Fix format of type parameters. if($upgrade && in_array($property->name, $typeprops)) { - OC_Log::write('contacts','OC_Contacts_VCard::updateValuesFromAdd. before: '.$property->serialize(),OC_Log::DEBUG); + OCP\Util::writeLog('contacts','OC_Contacts_VCard::updateValuesFromAdd. before: '.$property->serialize(),OCP\Util::DEBUG); self::formatPropertyTypes($property); - OC_Log::write('contacts','OC_Contacts_VCard::updateValuesFromAdd. after: '.$property->serialize(),OC_Log::DEBUG); + OCP\Util::writeLog('contacts','OC_Contacts_VCard::updateValuesFromAdd. after: '.$property->serialize(),OCP\Util::DEBUG); } if($property->name == 'FN'){ $fn = $property->value; @@ -222,7 +222,7 @@ class OC_Contacts_VCard{ $fn = 'Unknown Name'; } $vcard->setString('FN', $fn); - OC_Log::write('contacts','OC_Contacts_VCard::updateValuesFromAdd. Added missing \'FN\' field: '.$fn,OC_Log::DEBUG); + OCP\Util::writeLog('contacts','OC_Contacts_VCard::updateValuesFromAdd. Added missing \'FN\' field: '.$fn,OCP\Util::DEBUG); } if(!$n || $n = ';;;;'){ // Fix missing 'N' field. Ugly hack ahead ;-) $slice = array_reverse(array_slice(explode(' ', $fn), 0, 2)); // Take 2 first name parts of 'FN' and reverse. @@ -231,12 +231,12 @@ class OC_Contacts_VCard{ } $n = implode(';', $slice).';;;'; $vcard->setString('N', $n); - OC_Log::write('contacts','OC_Contacts_VCard::updateValuesFromAdd. Added missing \'N\' field: '.$n,OC_Log::DEBUG); + OC\Util::writeLog('contacts','OC_Contacts_VCard::updateValuesFromAdd. Added missing \'N\' field: '.$n,OCP\Util::DEBUG); } if(!$uid) { $vcard->setUID(); $uid = $vcard->getAsString('UID'); - OC_Log::write('contacts','OC_Contacts_VCard::updateValuesFromAdd. Added missing \'UID\' field: '.$uid,OC_Log::DEBUG); + OCP\Util::writeLog('contacts','OC_Contacts_VCard::updateValuesFromAdd. Added missing \'UID\' field: '.$uid,OCP\Util::DEBUG); } if(self::trueUID($aid, $uid)) { $vcard->setString('UID', $uid); @@ -263,7 +263,7 @@ class OC_Contacts_VCard{ */ public static function add($aid, OC_VObject $card, $uri=null){ if(is_null($card)){ - OC_Log::write('contacts','OC_Contacts_VCard::add. No vCard supplied', OC_Log::ERROR); + OCP\Util::writeLog('contacts','OC_Contacts_VCard::add. No vCard supplied', OCP\Util::ERROR); return null; }; @@ -317,10 +317,10 @@ class OC_Contacts_VCard{ $data = $vcard->serialize(); try { $result = $stmt->execute(array($data,time(),$object[0])); - //OC_Log::write('contacts','OC_Contacts_VCard::updateDataByID, id: '.$object[0].': '.$object[1],OC_Log::DEBUG); + //OCP\Util::writeLog('contacts','OC_Contacts_VCard::updateDataByID, id: '.$object[0].': '.$object[1],OCP\Util::DEBUG); } catch(Exception $e) { - OC_Log::write('contacts','OC_Contacts_VCard::updateDataByID:, exception: '.$e->getMessage(),OC_Log::DEBUG); - OC_Log::write('contacts','OC_Contacts_VCard::updateDataByID, id: '.$object[0],OC_Log::DEBUG); + OCP\Util::writeLog('contacts','OC_Contacts_VCard::updateDataByID:, exception: '.$e->getMessage(),OCP\Util::DEBUG); + OCP\Util::writeLog('contacts','OC_Contacts_VCard::updateDataByID, id: '.$object[0],OCP\Util::DEBUG); } } } @@ -526,9 +526,9 @@ class OC_Contacts_VCard{ $vals = array_merge((array)$aid, $id); $result = $stmt->execute($vals); } catch(Exception $e) { - OC_Log::write('contacts','OC_Contacts_VCard::moveToAddressBook:, exception: '.$e->getMessage(),OC_Log::DEBUG); - OC_Log::write('contacts','OC_Contacts_VCard::moveToAddressBook, ids: '.join(',', $vals),OC_Log::DEBUG); - OC_Log::write('contacts','SQL:'.$prep,OC_Log::DEBUG); + OCP\Util::writeLog('contacts','OC_Contacts_VCard::moveToAddressBook:, exception: '.$e->getMessage(),OCP\Util::DEBUG); + OCP\Util::writeLog('contacts','OC_Contacts_VCard::moveToAddressBook, ids: '.join(',', $vals),OCP\Util::DEBUG); + OCP\Util::writeLog('contacts','SQL:'.$prep,OCP\Util::DEBUG); return false; } } else { @@ -536,8 +536,8 @@ class OC_Contacts_VCard{ $stmt = OC_DB::prepare( 'UPDATE *PREFIX*contacts_cards SET addressbookid = ? WHERE id = ?' ); $result = $stmt->execute(array($aid, $id)); } catch(Exception $e) { - OC_Log::write('contacts','OC_Contacts_VCard::moveToAddressBook:, exception: '.$e->getMessage(),OC_Log::DEBUG); - OC_Log::write('contacts','OC_Contacts_VCard::moveToAddressBook, id: '.$id,OC_Log::DEBUG); + OCP\Util::writeLog('contacts','OC_Contacts_VCard::moveToAddressBook:, exception: '.$e->getMessage(),OCP\Util::DEBUG); + OCP\Util::writeLog('contacts','OC_Contacts_VCard::moveToAddressBook, id: '.$id,OCP\Util::DEBUG); return false; } } diff --git a/apps/contacts/photo.php b/apps/contacts/photo.php index c19ccccbc7f..f9e62455c13 100644..100755 --- a/apps/contacts/photo.php +++ b/apps/contacts/photo.php @@ -33,7 +33,7 @@ if(!$image) { } // invalid vcard if( is_null($contact)) { - OC_Log::write('contacts','photo.php. The VCard for ID '.$id.' is not RFC compatible',OC_Log::ERROR); + OCP\Util::writeLog('contacts','photo.php. The VCard for ID '.$id.' is not RFC compatible',OCP\Util::ERROR); } else { OC_Response::enableCaching($caching); OC_Contacts_App::setLastModifiedHeader($contact); diff --git a/apps/contacts/templates/part.cropphoto.php b/apps/contacts/templates/part.cropphoto.php index 5faa4aa6ac6..2284d49aca9 100644..100755 --- a/apps/contacts/templates/part.cropphoto.php +++ b/apps/contacts/templates/part.cropphoto.php @@ -1,7 +1,7 @@ <?php $id = $_['id']; $tmp_path = $_['tmp_path']; -OC_Log::write('contacts','templates/part.cropphoto.php: tmp_path: '.$tmp_path.', exists: '.file_exists($tmp_path), OC_Log::DEBUG); +OCP\Util::writeLog('contacts','templates/part.cropphoto.php: tmp_path: '.$tmp_path.', exists: '.file_exists($tmp_path), OCP\Util::DEBUG); ?> <script language="Javascript"> jQuery(function($) { diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php index 13f16954caf..1f9fbd7135e 100644..100755 --- a/apps/contacts/thumbnail.php +++ b/apps/contacts/thumbnail.php @@ -33,7 +33,7 @@ function getStandardImage(){ } if(!function_exists('imagecreatefromjpeg')) { - OC_Log::write('contacts','thumbnail.php. GD module not installed',OC_Log::DEBUG); + OCP\Util::writeLog('contacts','thumbnail.php. GD module not installed',OCP\Util::DEBUG); getStandardImage(); exit(); } @@ -45,7 +45,7 @@ $contact = OC_Contacts_App::getContactVCard($id); // invalid vcard if(is_null($contact)){ - OC_Log::write('contacts','thumbnail.php. The VCard for ID '.$id.' is not RFC compatible',OC_Log::ERROR); + OCP\Util::writeLog('contacts','thumbnail.php. The VCard for ID '.$id.' is not RFC compatible',OCP\Util::ERROR); getStandardImage(); exit(); } @@ -67,16 +67,16 @@ if($photo) { // done exit(); } else { - OC_Log::write('contacts','thumbnail.php. Couldn\'t display thumbnail for ID '.$id,OC_Log::ERROR); + OCP\Util::writeLog('contacts','thumbnail.php. Couldn\'t display thumbnail for ID '.$id,OCP\Util::ERROR); } } else { - OC_Log::write('contacts','thumbnail.php. Couldn\'t resize thumbnail for ID '.$id,OC_Log::ERROR); + OCP\Util::writeLog('contacts','thumbnail.php. Couldn\'t resize thumbnail for ID '.$id,OCP\Util::ERROR); } }else{ - OC_Log::write('contacts','thumbnail.php. Couldn\'t crop thumbnail for ID '.$id,OC_Log::ERROR); + OCP\Util::writeLog('contacts','thumbnail.php. Couldn\'t crop thumbnail for ID '.$id,OCP\Util::ERROR); } } else { - OC_Log::write('contacts','thumbnail.php. Couldn\'t load image string for ID '.$id,OC_Log::ERROR); + OCP\Util::writeLog('contacts','thumbnail.php. Couldn\'t load image string for ID '.$id,OCP\Util::ERROR); } } getStandardImage(); diff --git a/apps/files_archive/lib/zip.php b/apps/files_archive/lib/zip.php index 5a5bc766875..dd94859f089 100644..100755 --- a/apps/files_archive/lib/zip.php +++ b/apps/files_archive/lib/zip.php @@ -19,7 +19,7 @@ class OC_Archive_ZIP extends OC_Archive{ $this->zip=new ZipArchive(); if($this->zip->open($source,ZipArchive::CREATE)){ }else{ - OC_LOG::write('files_archive','Error while opening archive '.$source,OC_Log::WARN); + OCP\Util::writeLog('files_archive','Error while opening archive '.$source,OCP\Util::WARN); } } /** diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php index 07a2e523a42..1a7c595cb83 100644..100755 --- a/apps/files_encryption/lib/cryptstream.php +++ b/apps/files_encryption/lib/cryptstream.php @@ -42,12 +42,12 @@ class OC_CryptStream{ $this->path=self::$sourceStreams[basename($path)]['path']; }else{ $this->path=$path; - OC_Log::write('files_encryption','open encrypted '.$path. ' in '.$mode,OC_Log::DEBUG); + OCP\Util::writeLog('files_encryption','open encrypted '.$path. ' in '.$mode,OCP\Util::DEBUG); OC_FileProxy::$enabled=false;//disable fileproxies so we can open the source file $this->source=OC_FileSystem::fopen($path,$mode); OC_FileProxy::$enabled=true; if(!is_resource($this->source)){ - OC_Log::write('files_encryption','failed to open '.$path,OC_Log::ERROR); + OCP\Util::writeLog('files_encryption','failed to open '.$path,OCP\Util::ERROR); } } if(is_resource($this->source)){ @@ -68,7 +68,7 @@ class OC_CryptStream{ //$count will always be 8192 https://bugs.php.net/bug.php?id=21641 //This makes this function a lot simpler but will breake everything the moment it's fixed if($count!=8192){ - OC_Log::write('files_encryption','php bug 21641 no longer holds, decryption will not work',OC_Log::FATAL); + OCP\Util::writeLog('files_encryption','php bug 21641 no longer holds, decryption will not work',OCP\Util::FATAL); die(); } $data=fread($this->source,8192); @@ -135,4 +135,4 @@ class OC_CryptStream{ } return fclose($this->source); } -}
\ No newline at end of file +} diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php index d65bcba8bfa..11a6a84e667 100644..100755 --- a/apps/files_encryption/lib/proxy.php +++ b/apps/files_encryption/lib/proxy.php @@ -90,7 +90,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{ }elseif(self::shouldEncrypt($path) and $meta['mode']!='r' and $meta['mode']!='rb'){ if(OC_Filesystem::file_exists($path) and OC_Filesystem::filesize($path)>0){ //first encrypt the target file so we don't end up with a half encrypted file - OC_Log::write('files_encryption','Decrypting '.$path.' before writing',OC_Log::DEBUG); + OCP\Util::writeLog('files_encryption','Decrypting '.$path.' before writing',OCP\Util::DEBUG); $tmp=fopen('php://temp'); OC_Helper::streamCopy($result,$tmp); fclose($result); diff --git a/apps/files_sharing/ajax/share.php b/apps/files_sharing/ajax/share.php index 50c6d4c9d25..c704f653c11 100644..100755 --- a/apps/files_sharing/ajax/share.php +++ b/apps/files_sharing/ajax/share.php @@ -15,7 +15,7 @@ foreach ($sources as $source) { $source = $userDirectory.$source; // If the file doesn't exist, it may be shared with the current user } else if (!$source = OC_Share::getSource($userDirectory.$source)) { - OC_Log::write('files_sharing',"Shared file doesn't exists :".$source,OC_Log::ERROR); + OCP\Util::writeLog('files_sharing',"Shared file doesn't exists :".$source,OCP\Util::ERROR); echo "false"; } try { @@ -24,7 +24,7 @@ foreach ($sources as $source) { echo $shared->getToken(); } } catch (Exception $exception) { - OC_Log::write('files_sharing',"Unexpected Error : ".$exception->getMessage(),OC_Log::ERROR); + OC\Util::writeLog('files_sharing',"Unexpected Error : ".$exception->getMessage(),OCP\Util::ERROR); echo "false"; } } diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php index 62ac05a5952..c5127c59cbd 100644..100755 --- a/apps/files_sharing/lib_share.php +++ b/apps/files_sharing/lib_share.php @@ -310,7 +310,7 @@ class OC_Share { return $result[0]['permissions']; } } else { - OC_Log::write('files_sharing',"Not existing parent folder : ".$target,OC_Log::ERROR); + OCP\Util::writeLog('files_sharing',"Not existing parent folder : ".$target,OCP\Util::ERROR); return false; } } diff --git a/apps/files_texteditor/ajax/savefile.php b/apps/files_texteditor/ajax/savefile.php index 9f67cc4b4e6..7c7fb90e7c6 100644..100755 --- a/apps/files_texteditor/ajax/savefile.php +++ b/apps/files_texteditor/ajax/savefile.php @@ -40,7 +40,7 @@ if($path != '' && $mtime != '') { // Then the file has changed since opening OC_JSON::error(); - OC_Log::write('files_texteditor',"File: ".$path." modified since opening.",OC_Log::ERROR); + OCP\Util::writeLog('files_texteditor',"File: ".$path." modified since opening.",OCP\Util::ERROR); } else { @@ -59,10 +59,10 @@ if($path != '' && $mtime != '') { // Not writeable! OC_JSON::error(array('data' => array( 'message' => 'Insufficient permissions'))); - OC_Log::write('files_texteditor',"User does not have permission to write to file: ".$path,OC_Log::ERROR); + OCP\Util::writeLog('files_texteditor',"User does not have permission to write to file: ".$path,OCP\Util::ERROR); } } } else { OC_JSON::error(array('data' => array( 'message' => 'File path or mtime not supplied'))); - OC_Log::write('files_texteditor',"Invalid path supplied:".$path,OC_Log::ERROR); + OCP\Util::writeLog('files_texteditor',"Invalid path supplied:".$path,OCP\Util::ERROR); } diff --git a/apps/gallery/lib/hooks_handlers.php b/apps/gallery/lib/hooks_handlers.php index 737c38c0593..9257bbce628 100644..100755 --- a/apps/gallery/lib/hooks_handlers.php +++ b/apps/gallery/lib/hooks_handlers.php @@ -52,7 +52,7 @@ class OC_Gallery_Hooks_Handlers { if ($new_album_name == '') $new_album_name = 'main'; - OCP\Util::writeLog(self::$APP_TAG, 'Creating new album '.$new_album_name, OC_Log::DEBUG); + OCP\Util::writeLog(self::$APP_TAG, 'Creating new album '.$new_album_name, OCP\Util::DEBUG); OC_Gallery_Album::create(OC_User::getUser(), $new_album_name, $path); return OC_Gallery_Album::find(OC_User::getUser(), null, $path); @@ -110,7 +110,7 @@ class OC_Gallery_Hooks_Handlers { if ($olddir == '') $olddir = '/'; if ($newdir == '') $newdir = '/'; if (!self::isPhoto($newpath)) return; - OCP\Util::writeLog(self::$APP_TAG, 'Moving photo from '.$oldpath.' to '.$newpath, OC_Log::DEBUG); + OCP\Util::writeLog(self::$APP_TAG, 'Moving photo from '.$oldpath.' to '.$newpath, OCP\Util::DEBUG); $album; $newAlbumId; $oldAlbumId; diff --git a/apps/media/lib_scanner.php b/apps/media/lib_scanner.php index 5d652c1b39d..dc2a8a9beb4 100644..100755 --- a/apps/media/lib_scanner.php +++ b/apps/media/lib_scanner.php @@ -72,23 +72,23 @@ class OC_MEDIA_SCANNER{ $data=@self::$getID3->analyze($file); getid3_lib::CopyTagsToComments($data); if(!isset($data['comments'])){ - OCP\Util::writeLog('media',"error reading id3 tags in '$file'",OC_Log::WARN); + OCP\Util::writeLog('media',"error reading id3 tags in '$file'",OCP\Util::WARN); return; } if(!isset($data['comments']['artist'])){ - OCP\Util::writeLog('media',"error reading artist tag in '$file'",OC_Log::WARN); + OCP\Util::writeLog('media',"error reading artist tag in '$file'",OCP\Util::WARN); $artist='unknown'; }else{ $artist=stripslashes($data['comments']['artist'][0]); } if(!isset($data['comments']['album'])){ - OCP\Util::writeLog('media',"error reading album tag in '$file'",OC_Log::WARN); + OCP\Util::writeLog('media',"error reading album tag in '$file'",OCP\Util::WARN); $album='unknown'; }else{ $album=stripslashes($data['comments']['album'][0]); } if(!isset($data['comments']['title'])){ - OCP\Util::writeLog('media',"error reading title tag in '$file'",OC_Log::WARN); + OCP\Util::writeLog('media',"error reading title tag in '$file'",OCP\Util::WARN); $title='unknown'; }else{ $title=stripslashes($data['comments']['title'][0]); diff --git a/apps/media/server/xml.server.php b/apps/media/server/xml.server.php index 1ef48d551b5..bf277f3491c 100644..100755 --- a/apps/media/server/xml.server.php +++ b/apps/media/server/xml.server.php @@ -37,7 +37,7 @@ foreach($arguments as &$argument){ } @ob_clean(); if(isset($arguments['action'])){ - OCP\Util::writeLog('media','ampache '.$arguments['action'].' request', OC_Log::DEBUG); + OCP\Util::writeLog('media','ampache '.$arguments['action'].' request', OCP\Util::DEBUG); switch($arguments['action']){ case 'songs': OC_MEDIA_AMPACHE::songs($arguments); diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php index 55ef44c5d9a..327f6958ebf 100644..100755 --- a/apps/user_ldap/lib_ldap.php +++ b/apps/user_ldap/lib_ldap.php @@ -529,7 +529,7 @@ class OC_LDAP { self::init(); } if(is_null(self::$ldapConnectionRes)) { - OCP\Util::writeLog('ldap', 'Connection could not be established', OC_Log::INFO); + OCP\Util::writeLog('ldap', 'Connection could not be established', OCP\Util::INFO); } return self::$ldapConnectionRes; } diff --git a/apps/user_migrate/admin.php b/apps/user_migrate/admin.php index 643d58867ef..e94bda5baec 100644..100755 --- a/apps/user_migrate/admin.php +++ b/apps/user_migrate/admin.php @@ -37,7 +37,7 @@ if (isset($_POST['user_import'])) { $to = get_temp_dir().'/'.$importname.'.zip'; if( !move_uploaded_file( $from, $to ) ){ $error = array('error'=>'Failed to move the uploaded file','hint'=>'Try checking the permissions of the '.get_temp_dir().' dir.'); - OCP\Util::writeLog( 'user_migrate', "Failed to copy the uploaded file", OC_Log::ERROR ); + OCP\Util::writeLog( 'user_migrate', "Failed to copy the uploaded file", OCP\Util::ERROR ); $tmpl = new OC_Template('user_migrate', 'admin'); $tmpl->assign('error',$error); return $tmpl->fetchPage(); diff --git a/apps/user_openid/appinfo/app.php b/apps/user_openid/appinfo/app.php index 730039570a0..867a0a3ed33 100644..100755 --- a/apps/user_openid/appinfo/app.php +++ b/apps/user_openid/appinfo/app.php @@ -26,14 +26,14 @@ OC_User::useBackend('openid'); //check for results from openid requests if(isset($_GET['openid_mode']) and $_GET['openid_mode'] == 'id_res'){ - OCP\Util::writeLog('user_openid','openid retured',OC_Log::DEBUG); + OCP\Util::writeLog('user_openid','openid retured',OCP\Util::DEBUG); $openid = new SimpleOpenID; $openid->SetIdentity($_GET['openid_identity']); $openid_validation_result = $openid->ValidateWithServer(); if ($openid_validation_result == true){ // OK HERE KEY IS VALID - OCP\Util::writeLog('user_openid','auth sucessfull',OC_Log::DEBUG); + OCP\Util::writeLog('user_openid','auth sucessfull',OCP\Util::DEBUG); $identity=$openid->GetIdentity(); - OCP\Util::writeLog('user_openid','auth as '.$identity,OC_Log::DEBUG); + OCP\Util::writeLog('user_openid','auth as '.$identity,OCP\Util::DEBUG); $user=OC_USER_OPENID::findUserForIdentity($identity); if($user){ $_SESSION['user_id']=$user; @@ -41,13 +41,13 @@ if(isset($_GET['openid_mode']) and $_GET['openid_mode'] == 'id_res'){ } }else if($openid->IsError() == true){ // ON THE WAY, WE GOT SOME ERROR $error = $openid->GetError(); - OCP\Util::writeLog('user_openid','ERROR CODE: '. $error['code'],OC_Log::ERROR); - OCP\Util::writeLog('user_openid','ERROR DESCRIPTION: '. $error['description'],OC_Log::ERROR); + OCP\Util::writeLog('user_openid','ERROR CODE: '. $error['code'],OCP\Util::ERROR); + OCP\Util::writeLog('user_openid','ERROR DESCRIPTION: '. $error['description'],OCP\Util::ERROR); }else{ // Signature Verification Failed - OCP\Util::writeLog('user_openid','INVALID AUTHORIZATION',OC_Log::ERROR); + OCP\Util::writeLog('user_openid','INVALID AUTHORIZATION',OCP\Util::ERROR); } }else if (isset($_GET['openid_mode']) and $_GET['openid_mode'] == 'cancel'){ // User Canceled your Request - OCP\Util::writeLog('user_openid','USER CANCELED REQUEST',OC_Log::DEBUG); + OCP\Util::writeLog('user_openid','USER CANCELED REQUEST',OCP\Util::DEBUG); return false; } diff --git a/apps/user_openid/user.php b/apps/user_openid/user.php index edaa825baf7..59220aedc56 100644..100755 --- a/apps/user_openid/user.php +++ b/apps/user_openid/user.php @@ -40,7 +40,7 @@ require_once '../../lib/base.php'; OC_Util::checkAppEnabled('user_openid'); if(!OC_User::userExists($USERNAME)){ - OCP\Util::writeLog('user_openid',$USERNAME.' doesn\'t exist',OC_Log::WARN); + OCP\Util::writeLog('user_openid',$USERNAME.' doesn\'t exist',OCP\Util::WARN); $USERNAME=''; } $IDENTITY=OC_Helper::linkToAbsolute( "user_openid", "user.php" ).'/'.$USERNAME; diff --git a/lib/public/util.php b/lib/public/util.php index 8c52ff28b83..3e647fc6605 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -32,6 +32,13 @@ namespace OCP; class Util { + // consts for Logging + const DEBUG=0; + const INFO=1; + const WARN=2; + const ERROR=3; + const FATAL=4; + /** * send an email * @@ -57,7 +64,7 @@ class Util { * @param string $message * @param int level */ - public static function writelog($app, $message, $level) { + public static function writeLog($app, $message, $level) { // call the internal log class \OC_LOG::write($app, $message, $level); |