Page MenuHomePhorge

No OneTemporary

diff --git a/bin/dumpschema.php b/bin/dumpschema.php
index 683e2719e..53c688c3d 100644
--- a/bin/dumpschema.php
+++ b/bin/dumpschema.php
@@ -1,65 +1,65 @@
<?php
-define('INSTALL_PATH', realpath('./../') . '/');
+define('INSTALL_PATH', realpath(dirname(__FILE__) . '/..') . '/' );
require INSTALL_PATH.'program/include/iniset.php';
/** callback function for schema dump **/
function print_schema($dump)
{
foreach ((array)$dump as $part)
echo $dump . "\n";
}
$config = new rcube_config();
// don't allow public access if not in devel_mode
if (!$config->get('devel_mode') && $_SERVER['REMOTE_ADDR']) {
header("HTTP/1.0 401 Access denied");
die("Access denied!");
}
$options = array(
'use_transactions' => false,
'log_line_break' => "\n",
'idxname_format' => '%s',
'debug' => false,
'quote_identifier' => true,
'force_defaults' => false,
'portability' => false
);
$schema =& MDB2_Schema::factory($config->get('db_dsnw'), $options);
$schema->db->supported['transactions'] = false;
// send as text/xml when opened in browser
if ($_SERVER['REMOTE_ADDR'])
header('Content-Type: text/xml');
if (PEAR::isError($schema)) {
$error = $schema->getMessage() . ' ' . $schema->getUserInfo();
}
else {
$dump_config = array(
// 'output_mode' => 'file',
'output' => 'print_schema',
);
$definition = $schema->getDefinitionFromDatabase();
if (PEAR::isError($definition)) {
$error = $definition->getMessage() . ' ' . $definition->getUserInfo();
}
else {
$operation = $schema->dumpDatabase($definition, $dump_config, MDB2_SCHEMA_DUMP_STRUCTURE);
if (PEAR::isError($operation)) {
$error = $operation->getMessage() . ' ' . $operation->getUserInfo();
}
}
}
$schema->disconnect();
//if ($error)
// fputs(STDERR, $error);
?>
diff --git a/bin/makedoc.sh b/bin/makedoc.sh
index 5925d0a3f..02bc7a216 100755
--- a/bin/makedoc.sh
+++ b/bin/makedoc.sh
@@ -1,18 +1,29 @@
#!/bin/bash
TITLE="RoundCube Classes"
PACKAGES="Core"
-PATH_PROJECT=$PWD/program/include
-PATH_DOCS=$PWD/doc/phpdoc
-PATH_PHPDOC=/usr/local/php5/bin/phpdoc
+INSTALL_PATH="`dirname $0`/.."
+PATH_PROJECT=$INSTALL_PATH/program/include
+PATH_DOCS=$INSTALL_PATH/doc/phpdoc
+
+if [ -x /usr/local/php5/bin/phpdoc ]
+then
+ PATH_PHPDOC=/usr/local/php5/bin/phpdoc
+elif [ -x /usr/bin/phpdoc ]
+then
+ PATH_PHPDOC=/usr/bin/phpdoc
+else
+ echo "phpdoc not found"
+ exit 1
+fi
OUTPUTFORMAT=HTML
CONVERTER=frames
TEMPLATE=earthli
PRIVATE=off
# make documentation
$PATH_PHPDOC -d $PATH_PROJECT -t $PATH_DOCS -ti "$TITLE" -dn $PACKAGES \
-o $OUTPUTFORMAT:$CONVERTER:$TEMPLATE -pp $PRIVATE

File Metadata

Mime Type
text/x-diff
Expires
Sat, Mar 1, 10:56 AM (11 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
166733
Default Alt Text
(2 KB)

Event Timeline