aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-07-27 17:07:44 +0200
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-07-27 17:07:44 +0200
commitf6d730f9d1ce7957001bd981f04b32d67ebb44e6 (patch)
tree1431d9b1f649eea9eb4531b8b39cd9e2c27f6ec9 /app
parent2c2c57f837c8546b480900631698ba7402396102 (diff)
Fix issue #106 : modif nom classes Cache et Log
Passage en Minz_Cache et Minz_Log Permet d'éviter les redondances quand ces classes sont déjà définies Je n'utilise pas d'espace de nom parce que beaucoup de boulot et nécessite obligatoirement php 5.3 Si d'autres classes nécessitent cette modification je le ferai au fur et à mesure qu'on me remontera les soucis La version de Minz pour FreshRSS n'est plus compatible avec la version distribuée à part
Diffstat (limited to 'app')
-rwxr-xr-xapp/controllers/configureController.php2
-rwxr-xr-xapp/controllers/feedController.php10
-rwxr-xr-xapp/controllers/indexController.php2
-rwxr-xr-xapp/models/Category.php6
-rwxr-xr-xapp/models/Entry.php14
-rw-r--r--app/models/Feed.php14
6 files changed, 24 insertions, 24 deletions
diff --git a/app/controllers/configureController.php b/app/controllers/configureController.php
index b91582520..abd546504 100755
--- a/app/controllers/configureController.php
+++ b/app/controllers/configureController.php
@@ -244,7 +244,7 @@ class configureController extends ActionController {
Request::_param ('feeds', $feeds);
Request::forward (array ('c' => 'feed', 'a' => 'massiveImport'));
} catch (OpmlException $e) {
- Log::record ($e->getMessage (), Log::ERROR);
+ Minz_Log::record ($e->getMessage (), Minz_Log::ERROR);
$notif = array (
'type' => 'bad',
diff --git a/app/controllers/feedController.php b/app/controllers/feedController.php
index 4631e1e7e..21ea2aadd 100755
--- a/app/controllers/feedController.php
+++ b/app/controllers/feedController.php
@@ -86,14 +86,14 @@ class feedController extends ActionController {
$params['id'] = $feed->id ();
}
} catch (BadUrlException $e) {
- Log::record ($e->getMessage (), Log::ERROR);
+ Minz_Log::record ($e->getMessage (), Minz_Log::ERROR);
$notif = array (
'type' => 'bad',
'content' => Translate::t ('invalid_url', $url)
);
Session::_param ('notification', $notif);
} catch (FeedException $e) {
- Log::record ($e->getMessage (), Log::ERROR);
+ Minz_Log::record ($e->getMessage (), Minz_Log::ERROR);
$notif = array (
'type' => 'bad',
'content' => Translate::t ('internal_problem_feed')
@@ -101,7 +101,7 @@ class feedController extends ActionController {
Session::_param ('notification', $notif);
} catch (FileNotExistException $e) {
// Répertoire de cache n'existe pas
- Log::record ($e->getMessage (), Log::ERROR);
+ Minz_Log::record ($e->getMessage (), Minz_Log::ERROR);
$notif = array (
'type' => 'bad',
'content' => Translate::t ('internal_problem_feed')
@@ -160,7 +160,7 @@ class feedController extends ActionController {
$feedDAO->updateLastUpdate ($feed->id ());
$flux_update++;
} catch (FeedException $e) {
- Log::record ($e->getMessage (), Log::ERROR);
+ Minz_Log::record ($e->getMessage (), Minz_Log::ERROR);
$feedDAO->isInError ($feed->id ());
}
@@ -264,7 +264,7 @@ class feedController extends ActionController {
}
} catch (FeedException $e) {
$error = true;
- Log::record ($e->getMessage (), Log::ERROR);
+ Minz_Log::record ($e->getMessage (), Minz_Log::ERROR);
}
}
diff --git a/app/controllers/indexController.php b/app/controllers/indexController.php
index 594d379fb..d23db01a3 100755
--- a/app/controllers/indexController.php
+++ b/app/controllers/indexController.php
@@ -59,7 +59,7 @@ class indexController extends ActionController {
$this->view->entryPaginator = $entries;
} catch(EntriesGetterException $e) {
- Log::record ($e->getMessage (), Log::NOTICE);
+ Minz_Log::record ($e->getMessage (), Minz_Log::NOTICE);
Error::error (
404,
array ('error' => array (Translate::t ('page_not_found')))
diff --git a/app/models/Category.php b/app/models/Category.php
index 0c991588d..197c4df26 100755
--- a/app/models/Category.php
+++ b/app/models/Category.php
@@ -78,7 +78,7 @@ class CategoryDAO extends Model_pdo {
return true;
} else {
$info = $stm->errorInfo();
- Log::record ('SQL error : ' . $info[2], Log::ERROR);
+ Minz_Log::record ('SQL error : ' . $info[2], Minz_Log::ERROR);
return false;
}
}
@@ -97,7 +97,7 @@ class CategoryDAO extends Model_pdo {
return true;
} else {
$info = $stm->errorInfo();
- Log::record ('SQL error : ' . $info[2], Log::ERROR);
+ Minz_Log::record ('SQL error : ' . $info[2], Minz_Log::ERROR);
return false;
}
}
@@ -112,7 +112,7 @@ class CategoryDAO extends Model_pdo {
return true;
} else {
$info = $stm->errorInfo();
- Log::record ('SQL error : ' . $info[2], Log::ERROR);
+ Minz_Log::record ('SQL error : ' . $info[2], Minz_Log::ERROR);
return false;
}
}
diff --git a/app/models/Entry.php b/app/models/Entry.php
index ac1004fb6..1382a0d16 100755
--- a/app/models/Entry.php
+++ b/app/models/Entry.php
@@ -245,7 +245,7 @@ class EntryDAO extends Model_pdo {
return true;
} else {
$info = $stm->errorInfo();
- Log::record ('SQL error : ' . $info[2], Log::NOTICE);
+ Minz_Log::record ('SQL error : ' . $info[2], Minz_Log::NOTICE);
return false;
}
}
@@ -273,7 +273,7 @@ class EntryDAO extends Model_pdo {
return true;
} else {
$info = $stm->errorInfo();
- Log::record ('SQL error : ' . $info[2], Log::ERROR);
+ Minz_Log::record ('SQL error : ' . $info[2], Minz_Log::ERROR);
return false;
}
}
@@ -288,7 +288,7 @@ class EntryDAO extends Model_pdo {
return true;
} else {
$info = $stm->errorInfo();
- Log::record ('SQL error : ' . $info[2], Log::ERROR);
+ Minz_Log::record ('SQL error : ' . $info[2], Minz_Log::ERROR);
return false;
}
}
@@ -302,7 +302,7 @@ class EntryDAO extends Model_pdo {
return true;
} else {
$info = $stm->errorInfo();
- Log::record ('SQL error : ' . $info[2], Log::ERROR);
+ Minz_Log::record ('SQL error : ' . $info[2], Minz_Log::ERROR);
return false;
}
}
@@ -316,7 +316,7 @@ class EntryDAO extends Model_pdo {
return true;
} else {
$info = $stm->errorInfo();
- Log::record ('SQL error : ' . $info[2], Log::ERROR);
+ Minz_Log::record ('SQL error : ' . $info[2], Minz_Log::ERROR);
return false;
}
}
@@ -343,7 +343,7 @@ class EntryDAO extends Model_pdo {
return true;
} else {
$info = $stm->errorInfo();
- Log::record ('SQL error : ' . $info[2], Log::ERROR);
+ Minz_Log::record ('SQL error : ' . $info[2], Minz_Log::ERROR);
return false;
}
}
@@ -361,7 +361,7 @@ class EntryDAO extends Model_pdo {
return true;
} else {
$info = $stm->errorInfo();
- Log::record ('SQL error : ' . $info[2], Log::ERROR);
+ Minz_Log::record ('SQL error : ' . $info[2], Minz_Log::ERROR);
return false;
}
}
diff --git a/app/models/Feed.php b/app/models/Feed.php
index 4c6a3d229..9d1047bd4 100644
--- a/app/models/Feed.php
+++ b/app/models/Feed.php
@@ -258,7 +258,7 @@ class FeedDAO extends Model_pdo {
return true;
} else {
$info = $stm->errorInfo();
- Log::record ('SQL error : ' . $info[2], Log::ERROR);
+ Minz_Log::record ('SQL error : ' . $info[2], Minz_Log::ERROR);
return false;
}
}
@@ -286,7 +286,7 @@ class FeedDAO extends Model_pdo {
return true;
} else {
$info = $stm->errorInfo();
- Log::record ('SQL error : ' . $info[2], Log::ERROR);
+ Minz_Log::record ('SQL error : ' . $info[2], Minz_Log::ERROR);
return false;
}
}
@@ -304,7 +304,7 @@ class FeedDAO extends Model_pdo {
return true;
} else {
$info = $stm->errorInfo();
- Log::record ('SQL error : ' . $info[2], Log::ERROR);
+ Minz_Log::record ('SQL error : ' . $info[2], Minz_Log::ERROR);
return false;
}
}
@@ -321,7 +321,7 @@ class FeedDAO extends Model_pdo {
return true;
} else {
$info = $stm->errorInfo();
- Log::record ('SQL error : ' . $info[2], Log::ERROR);
+ Minz_Log::record ('SQL error : ' . $info[2], Minz_Log::ERROR);
return false;
}
}
@@ -345,7 +345,7 @@ class FeedDAO extends Model_pdo {
return true;
} else {
$info = $stm->errorInfo();
- Log::record ('SQL error : ' . $info[2], Log::ERROR);
+ Minz_Log::record ('SQL error : ' . $info[2], Minz_Log::ERROR);
return false;
}
}
@@ -360,7 +360,7 @@ class FeedDAO extends Model_pdo {
return true;
} else {
$info = $stm->errorInfo();
- Log::record ('SQL error : ' . $info[2], Log::ERROR);
+ Minz_Log::record ('SQL error : ' . $info[2], Minz_Log::ERROR);
return false;
}
}
@@ -374,7 +374,7 @@ class FeedDAO extends Model_pdo {
return true;
} else {
$info = $stm->errorInfo();
- Log::record ('SQL error : ' . $info[2], Log::ERROR);
+ Minz_Log::record ('SQL error : ' . $info[2], Minz_Log::ERROR);
return false;
}
}