From: vincent@cubedesigners.com Date: Wed, 30 Jan 2013 10:19:06 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=6e9edd2b3b3d3a105aabcc22db09ac8d4e068820;p=cubeextranet.git --- diff --git a/images/extranet/favicon/favicon-ios-114.png b/images/extranet/favicon/favicon-ios-114.png new file mode 100644 index 000000000..f6c50a619 Binary files /dev/null and b/images/extranet/favicon/favicon-ios-114.png differ diff --git a/images/extranet/favicon/favicon-ios-144.png b/images/extranet/favicon/favicon-ios-144.png new file mode 100644 index 000000000..a0c5d9da5 Binary files /dev/null and b/images/extranet/favicon/favicon-ios-144.png differ diff --git a/images/extranet/favicon/favicon-ios-57.png b/images/extranet/favicon/favicon-ios-57.png new file mode 100644 index 000000000..eac602a88 Binary files /dev/null and b/images/extranet/favicon/favicon-ios-57.png differ diff --git a/images/extranet/favicon/favicon-ios-72.png b/images/extranet/favicon/favicon-ios-72.png new file mode 100644 index 000000000..7d7aa801e Binary files /dev/null and b/images/extranet/favicon/favicon-ios-72.png differ diff --git a/images/extranet/favicon/favicon.icns b/images/extranet/favicon/favicon.icns new file mode 100644 index 000000000..87ac508e0 Binary files /dev/null and b/images/extranet/favicon/favicon.icns differ diff --git a/images/extranet/favicon/favicon.ico b/images/extranet/favicon/favicon.ico new file mode 100644 index 000000000..26b902269 Binary files /dev/null and b/images/extranet/favicon/favicon.ico differ diff --git a/images/extranet/favicon/favicon.png b/images/extranet/favicon/favicon.png new file mode 100644 index 000000000..7145af7be Binary files /dev/null and b/images/extranet/favicon/favicon.png differ diff --git a/inc/commons/class.common.page.php b/inc/commons/class.common.page.php index 58fd503bf..7f2eb9a8b 100644 --- a/inc/commons/class.common.page.php +++ b/inc/commons/class.common.page.php @@ -10,8 +10,6 @@ class commonPage { $res .= ''; // Titre de la page $res .= '' . TITLE . ''; - // Favicon - $res .= cubePage::favicon(IMG . '/favicon.ico'); $res .= ''; $res .= ''; // Haut de la page diff --git a/inc/postconfig.inc.php b/inc/postconfig.inc.php index d9d975ed4..100e65dee 100644 --- a/inc/postconfig.inc.php +++ b/inc/postconfig.inc.php @@ -37,6 +37,8 @@ define('SYSSTYLE', ROOT . '/style/' . MODE); define('SYSIMG', ROOT . '/images/' . MODE); define('IMG', WEBROOT . '/images/' . MODE); +$faviconroot=IMG.'/favicon'; + define('TYPOGRAPHP_PATH', ROOT . '/typo/' . MODE); define('TYPOGRAPHP_WEBROOT', IMG . '/typographp'); ?> \ No newline at end of file diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php index d3e42f418..61b28997f 100644 --- a/inc/ws/Controlleur/class.ws.maintenance.php +++ b/inc/ws/Controlleur/class.ws.maintenance.php @@ -21,7 +21,6 @@ class wsMaintenance { } } - public static function compactLinks() { global $core; $r = $core->con->select('SELECT * FROM `document_links_versions` GROUP BY document_id,links,rulers'); @@ -493,6 +492,9 @@ class wsMaintenance { // Clean downloads foreach ($dirs as $dir) { + if (!file_exists($dir)) { + continue; + } $dr = opendir($dir); while ($file = readdir($dr)) { if ($file == '.' || $file == '..') { @@ -729,7 +731,6 @@ class wsMaintenance { $svn = new cubeCommandLine('updatewshtml5prod'); $svn->setPath(CONVERTER_PATH); $svn->execute(); - } public static function cleanDownload($args) { @@ -759,6 +760,7 @@ class wsMaintenance { cubeFiles::deleteFilesOlderThan('/home/ws/ftp', 60); cubeFiles::deleteFilesOlderThan('/home/ws/www/getpdf', 60); } + } ?> \ No newline at end of file