Peter M. Groen / knowledgetree

Commit e9e4fc2b50d7f2f452feed683172fc86129d19c8

Authored by kevin_fourie
1 parent ca93a924

KTS-3057 

"Cleanup link on System Folder Utilization dashlet points to an non-existing url"
Fixed. Cleaned up Url creation for Windows.

Committed By: Kevin Fourie
Reviewed By: Conrad Vermeulen

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@8133 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 3 changed files with 25 additions and 6 deletions
bin/openoffice/pdfgen.py
  View file @e9e4fc2
@@ -84,7 +84,7 @@ except RuntimeException, e: @@ -84,7 +84,7 @@ except RuntimeException, e:
84 sys.stderr.write("An unknown error occured: " + e.Message + "\n") 84 sys.stderr.write("An unknown error occured: " + e.Message + "\n")
85 85
86 if doc == None: 86 if doc == None:
87 - sys.stderr.write("OpenOffice could not load the document for conversion. This could indicate an unsupported minetype.\n") 87 + sys.stderr.write("The document could not be opened for conversion. This could indicate an unsupported mimetype.\n")
88 sys.exit(1) 88 sys.exit(1)
89 89
90 90
@@ -100,5 +100,14 @@ p.Value = 'writer_pdf_Export' @@ -100,5 +100,14 @@ p.Value = 'writer_pdf_Export'
100 properties.append(p) 100 properties.append(p)
101 properties = tuple(properties) 101 properties = tuple(properties)
102 102
103 -doc.storeToURL(url_save, properties)  
104 -doc.dispose() 103 +try:
  104 + doc.storeToURL(url_save, properties)
  105 + doc.dispose()
  106 +except IOException, e:
  107 + sys.stderr.write("URL (" + url_save + ") couldn't be found or was corrupt (" + e.Message + ")\n")
  108 + sys.exit(1)
  109 +except IllegalArgumentException, e:
  110 + sys.stderr.write("Given parameters don't conform to the specification ( " + e.Message + ")\n")
  111 + sys.exit(1)
  112 +except RuntimeException, e:
  113 + sys.stderr.write("An unknown error occured: " + e.Message + "\n")
plugins/housekeeper/DiskUsageDashlet.inc.php
  View file @e9e4fc2
@@ -145,7 +145,16 @@ class DiskUsageDashlet extends KTBaseDashlet @@ -145,7 +145,16 @@ class DiskUsageDashlet extends KTBaseDashlet
145 $oRegistry =& KTPluginRegistry::getSingleton(); 145 $oRegistry =& KTPluginRegistry::getSingleton();
146 $oPlugin =& $oRegistry->getPlugin('ktcore.housekeeper.plugin'); 146 $oPlugin =& $oRegistry->getPlugin('ktcore.housekeeper.plugin');
147 147
  148 + $config = KTConfig::getSingleton();
  149 + $rootUrl = $config->get('KnowledgeTree/rootUrl');
  150 +
148 $dispatcherURL = $oPlugin->getURLPath('HouseKeeperDispatcher.php'); 151 $dispatcherURL = $oPlugin->getURLPath('HouseKeeperDispatcher.php');
  152 + if (!empty($rootUrl)) $dispatcherURL .= $rootUrl . $dispatcherURL;
  153 + if ( substr( $dispatcherURL, 0,1 ) == '/' || substr( $dispatcherURL, 0,1 ) == '\\')
  154 + {
  155 + $dispatcherURL = substr($dispatcherURL,1);
  156 + }
  157 + $dispatcherURL = str_replace( '\\', '/', $dispatcherURL);
149 158
150 159
151 $aTemplateData = array( 160 $aTemplateData = array(
plugins/housekeeper/FolderUsageDashlet.inc.php
  View file @e9e4fc2
@@ -156,12 +156,13 @@ class FolderUsageDashlet extends KTBaseDashlet @@ -156,12 +156,13 @@ class FolderUsageDashlet extends KTBaseDashlet
156 156
157 $dispatcherURL = $oPlugin->getURLPath('HouseKeeperDispatcher.php'); 157 $dispatcherURL = $oPlugin->getURLPath('HouseKeeperDispatcher.php');
158 if (!empty($rootUrl)) $dispatcherURL .= $rootUrl . $dispatcherURL; 158 if (!empty($rootUrl)) $dispatcherURL .= $rootUrl . $dispatcherURL;
159 - if (substr($dispatcherURL, 0,1 ) == '/') 159 + if ( substr( $dispatcherURL, 0,1 ) == '/' || substr( $dispatcherURL, 0,1 ) == '\\')
160 { 160 {
161 $dispatcherURL = substr($dispatcherURL,1); 161 $dispatcherURL = substr($dispatcherURL,1);
162 } 162 }
163 -  
164 - $this->getUsage(); 163 + $dispatcherURL = str_replace( '\\', '/', $dispatcherURL);
  164 +
  165 + $this->getUsage();
165 166
166 $aTemplateData = array( 167 $aTemplateData = array(
167 'context' => $this, 168 'context' => $this,