Bug #18520 » indexed_search_7969_t3_42.patch

Administrator Admin, 2011-01-18 13:57

View differences:

indexed_search/class.external_parser.php 2010-10-06 12:26:28.000000000 +0200
114 114
					// PDF
115 115
				if ($indexerConfig['pdftools'])	{
116 116
					$pdfPath = ereg_replace("\/$",'',$indexerConfig['pdftools']).'/';
117
					if (ini_get('safe_mode') || (@is_file($pdfPath.'pdftotext'.$exe) && @is_file($pdfPath.'pdfinfo'.$exe)))	{
117
					if (ini_get('safe_mode') || ini_get('open_basedir') || (@is_file($pdfPath.'pdftotext'.$exe) && @is_file($pdfPath.'pdfinfo'.$exe)))	{
118 118
						$this->app['pdfinfo'] = $pdfPath.'pdfinfo'.$exe;
119 119
						$this->app['pdftotext'] = $pdfPath.'pdftotext'.$exe;
120 120
							// PDF mode:
......
127 127
					// Catdoc
128 128
				if ($indexerConfig['catdoc'])	{
129 129
					$catdocPath = ereg_replace("\/$",'',$indexerConfig['catdoc']).'/';
130
					if (ini_get('safe_mode') || @is_file($catdocPath.'catdoc'.$exe))	{
130
					if (ini_get('safe_mode') || ini_get('open_basedir') || @is_file($catdocPath.'catdoc'.$exe))	{
131 131
						$this->app['catdoc'] = $catdocPath.'catdoc'.$exe;
132 132
						$extOK = TRUE;
133 133
					} else $this->pObj->log_setTSlogMessage("'catdoc' tool for reading Word-files was not found in path '".$catdocPath."catdoc'",3);
......
138 138
					// ppthtml
139 139
				if ($indexerConfig['ppthtml'])	{
140 140
					$ppthtmlPath = ereg_replace('\/$','',$indexerConfig['ppthtml']).'/';
141
					if (ini_get('safe_mode') || @is_file($ppthtmlPath.'ppthtml'.$exe)){
141
					if (ini_get('safe_mode') || ini_get('open_basedir') || @is_file($ppthtmlPath.'ppthtml'.$exe)){
142 142
						$this->app['ppthtml'] = $ppthtmlPath.'ppthtml'.$exe;
143 143
						$extOK = TRUE;
144 144
					} else $this->pObj->log_setTSlogMessage("'ppthtml' tool for reading Powerpoint-files was not found in path '".$ppthtmlPath."ppthtml'",3);
......
148 148
					// Xlhtml
149 149
				if ($indexerConfig['xlhtml'])	{
150 150
					$xlhtmlPath = ereg_replace('\/$','',$indexerConfig['xlhtml']).'/';
151
					if (ini_get('safe_mode') || @is_file($xlhtmlPath.'xlhtml'.$exe)){
151
					if (ini_get('safe_mode') || ini_get('open_basedir') || @is_file($xlhtmlPath.'xlhtml'.$exe)){
152 152
						$this->app['xlhtml'] = $xlhtmlPath.'xlhtml'.$exe;
153 153
						$extOK = TRUE;
154 154
					} else $this->pObj->log_setTSlogMessage("'xlhtml' tool for reading Excel-files was not found in path '".$xlhtmlPath."xlhtml'",3);
......
162 162
			case 'odt':		// Oasis OpenDocument Text
163 163
				if ($indexerConfig['unzip'])	{
164 164
					$unzipPath = preg_replace('/\/$/','',$indexerConfig['unzip']).'/';
165
					if (ini_get('safe_mode') || @is_file($unzipPath.'unzip'.$exe))	{
165
					if (ini_get('safe_mode') || ini_get('open_basedir') || @is_file($unzipPath.'unzip'.$exe))	{
166 166
						$this->app['unzip'] = $unzipPath.'unzip'.$exe;
167 167
						$extOK = TRUE;
168 168
					} else $this->pObj->log_setTSlogMessage("'unzip' tool for reading OpenOffice.org-files was not found in path '".$unzipPath."unzip'",3);
......
172 172
					// Catdoc
173 173
				if ($indexerConfig['unrtf'])	{
174 174
					$unrtfPath = ereg_replace("\/$",'',$indexerConfig['unrtf']).'/';
175
					if (ini_get('safe_mode') || @is_file($unrtfPath.'unrtf'.$exe))	{
175
					if (ini_get('safe_mode') || ini_get('open_basedir') || @is_file($unrtfPath.'unrtf'.$exe))	{
176 176
						$this->app['unrtf'] = $unrtfPath.'unrtf'.$exe;
177 177
						$extOK = TRUE;
178 178
					} else $this->pObj->log_setTSlogMessage("'unrtf' tool for reading RTF-files was not found in path '".$unrtfPath."unrtf'",3);
(4-4/7)