summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/action.php2
-rw-r--r--lib/common.php19
-rw-r--r--lib/settingsaction.php2
-rw-r--r--lib/stream.php2
4 files changed, 14 insertions, 11 deletions
diff --git a/lib/action.php b/lib/action.php
index 049885acd..f8442a1f0 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-if (!defined('LACONICA')) { exit(1) }
+if (!defined('LACONICA')) { exit(1); }
class Action { // lawsuit
diff --git a/lib/common.php b/lib/common.php
index 069541026..0d734e2b4 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -20,7 +20,7 @@
/* XXX: break up into separate modules (HTTP, HTML, user, files) */
-if (!defined('LACONICA')) { exit(1) }
+if (!defined('LACONICA')) { exit(1); }
define('AVATAR_PROFILE_SIZE', 96);
define('AVATAR_STREAM_SIZE', 48);
@@ -41,10 +41,11 @@ $config =
'path' => '/'),
'avatar' =>
array('directory' => INSTALLDIR . 'files',
- 'path' => '/files'),
- 'db' => &PEAR::getStaticProperty('DB_DataObject','options'),
+ 'path' => '/files')
);
+$config['db'] = &PEAR::getStaticProperty('DB_DataObject','options');
+
$config['db'] =
array('database' => 'YOU HAVE TO SET THIS IN config.php',
'schema_location' => $INSTALLDIR . '/classes',
@@ -279,10 +280,10 @@ function commmon_date_string($dt) {
}
function common_redirect($url, $code=307) {
- static $status = (301 => "Moved Permanently",
- 302 => "Found",
- 303 => "See Other",
- 307 => "Temporary Redirect");
+ static $status = array(301 => "Moved Permanently",
+ 302 => "Found",
+ 303 => "See Other",
+ 307 => "Temporary Redirect");
header("Status: ${code} $status[$code]");
header("Location: $url");
common_element('a', array('href' => $url), $url);
@@ -299,4 +300,6 @@ function common_broadcast_notices($id) {
// XXX: set up gettext
-function _t($str) { $str }
+function _t($str) {
+ return $str;
+}
diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 1795969f9..d74e226d8 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-if (!defined('LACONICA')) { exit(1) }
+if (!defined('LACONICA')) { exit(1); }
class SettingsAction extends Action {
diff --git a/lib/stream.php b/lib/stream.php
index 6b2ab24ff..2b8361a73 100644
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-if (!defined('LACONICA')) { exit(1) }
+if (!defined('LACONICA')) { exit(1); }
define('NOTICES_PER_PAGE', 20);