From 38409f1683351ae2b9bc932d441c6021a8b2aae7 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Tue, 15 Sep 2009 14:37:11 -0700 Subject: [PATCH 1/3] Add Jiminy to notice sources --- db/notice_source.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/db/notice_source.sql b/db/notice_source.sql index f590d1b97a..2657763f44 100644 --- a/db/notice_source.sql +++ b/db/notice_source.sql @@ -21,6 +21,7 @@ VALUES ('identichat','identichat','http://identichat.prosody.im/', now()), ('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()), ('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()), + ('Jiminy','Jiminy','http://code.google.com/p/jiminy/', now()), ('LaTwit','LaTwit','http://latwit.mac65.com/', now()), ('LiveTweeter', 'LiveTweeter', 'http://addons.songbirdnest.com/addon/1204', now()), ('livetweeter', 'livetweeter', 'http://addons.songbirdnest.com/addon/1204', now()), From 94466da35afcb0b1680a478964b58fbc7970f4ec Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Tue, 15 Sep 2009 16:31:09 -0700 Subject: [PATCH 2/3] Got rid of a bunch of ugly warnings --- install.php | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/install.php b/install.php index 07a7bfaaf7..a8f1ef4e24 100644 --- a/install.php +++ b/install.php @@ -1,5 +1,5 @@ . - * + * * @category Installation * @package Installation - * + * * @author Adrian Lang * @author Brenda Wallace * @author Brett Taylor @@ -33,7 +33,7 @@ * @author Tom Adams * @license GNU Affero General Public License http://www.gnu.org/licenses/ */ - + define('INSTALLDIR', dirname(__FILE__)); $external_libraries=array( @@ -211,10 +211,10 @@ $dbModules = array( ), ); -/** +/** * the actual installation. * If call libraries are present, then install - * + * * @return void */ function main() @@ -222,8 +222,8 @@ function main() if (!checkPrereqs()) { return; } - - if ($_GET['checklibs']) { + + if (!empty($_GET['checklibs'])) { showLibs(); } else { if ($_SERVER['REQUEST_METHOD'] == 'POST') { @@ -243,7 +243,7 @@ function main() */ function haveExternalLibrary($external_library) { - if (isset($external_library['include']) && ! include_once $external_library['include'] ) { + if (isset($external_library['include']) && ! @include_once $external_library['include'] ) { return false; } if (isset($external_library['check_function']) && ! function_exists($external_library['check_function'])) { @@ -282,7 +282,7 @@ function checkPrereqs() printf('

Cannot load required extension: %s

', $req); $pass = false; } - } + } // Make sure we have at least one database module available global $dbModules; $missingExtensions = array(); @@ -291,13 +291,13 @@ function checkPrereqs() $missingExtensions[] = $info['check_module']; } } - + if (count($missingExtensions) == count($dbModules)) { $req = implode(', ', $missingExtensions); - printf('

Cannot find mysql or pgsql extension. You need one or the other: %s

', $req); + printf('

Cannot find mysql or pgsql extension. You need one or the other.'); $pass = false; } - + if (!is_writable(INSTALLDIR)) { printf('

Cannot write config file to: %s

', INSTALLDIR); printf('

On your server, try this command: chmod a+w %s', INSTALLDIR); @@ -365,19 +365,19 @@ function showLibs() E_O_T; foreach ($absent_libraries as $library) { echo '

  • '; - if ($library['url']) { + if (isset($library['url'])) { echo ''.htmlentities($library['name']).''; } else { echo htmlentities($library['name']); } echo '
      '; - if ($library['deb']) { + if (isset($library['deb'])) { echo '
    • deb: ' . htmlentities($library['deb']) . '
      • '; } - if ($library['rpm']) { + if (isset($library['rpm'])) { echo '
    • rpm: ' . htmlentities($library['rpm']) . '
      • '; } - if ($library['pear']) { + if (isset($library['pear'])) { echo '
    • pear: ' . htmlentities($library['pear']) . '
      • '; } echo '
    '; @@ -552,7 +552,7 @@ STR; updateStatus("You can visit your new StatusNet site."); } -function Pgsql_Db_installer($host, $database, $username, $password) +function Pgsql_Db_installer($host, $database, $username, $password) { $connstring = "dbname=$database host=$host user=$username"; @@ -613,7 +613,7 @@ function Pgsql_Db_installer($host, $database, $username, $password) return $db; } -function Mysql_Db_installer($host, $database, $username, $password) +function Mysql_Db_installer($host, $database, $username, $password) { updateStatus("Starting installation..."); updateStatus("Checking database..."); @@ -690,7 +690,7 @@ function writeConf($sitename, $server, $path, $fancy, $db) * @param string $filename location of database schema file * @param dbconn $conn connection to database * @param string $type type of database, currently mysql or pgsql - * + * * @return boolean - indicating success or failure */ function runDbScript($filename, $conn, $type = 'mysqli') From e29046b3a121db6aa95f94d4114467d0e747c6a7 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Tue, 15 Sep 2009 16:46:18 -0700 Subject: [PATCH 3/3] Fixed broken list items in installer output --- install.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/install.php b/install.php index a8f1ef4e24..54ae0cd5e1 100644 --- a/install.php +++ b/install.php @@ -477,7 +477,11 @@ E_O_T; function updateStatus($status, $error=false) { - echo '
  • $status
    • "; }