fixes to make it all lint

Ran everything through php -l, found out that it didn't compile.

So: fixed the am-I-running-in-Laconica check at the top of each file.
Some syntax fixes in shownotice, showstream, common.

darcs-hash:20080517154701-84dde-8d38da89c5b9cb3b40704adb04a4de880c204181.gz

diff --git a/actions/all.php b/actions/all.php
index 8efaa5a82afa5d45a02bd47dac15961d763c0586..f1a2229f0340a8e6000c4bd2b8d0724b452ed4c4 100644 (file)
--- a/actions/all.php
+++ b/actions/all.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 AllAction extends ShowstreamAction {
 

diff --git a/actions/avatar.php b/actions/avatar.php
index b715e02dee6e043ca0a958fc2e4ad1cfb99bdc92..2244e7c78257387b5468f19a959aad7a8eb3bd37 100644 (file)
--- a/actions/avatar.php
+++ b/actions/avatar.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 AvatarAction extends SettingsAction {
 

diff --git a/actions/login.php b/actions/login.php
index c37f92b79c90b73fd52c4d60286a5ee57397d16e..3f096dc0c6a77a3acb941a1a72a8a532b8fa5d15 100644 (file)
--- a/actions/login.php
+++ b/actions/login.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 LoginAction extends Action {
        

diff --git a/actions/logout.php b/actions/logout.php
index 3b6914411b263e6c80da5bc98b3246fde44296bd..b2f0628f219508f07fa7d826291b044621c6956e 100644 (file)
--- a/actions/logout.php
+++ b/actions/logout.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 LogoutAction extends Action {
        function handle($args) {

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 40a196a23642bbd14b1d59e4fbc3e0f5ff567983..b15232dec4a86f60605b982d329646635c3527da 100644 (file)
--- a/actions/newnotice.php
+++ b/actions/newnotice.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 NewnoticeAction extends Action {
        

diff --git a/actions/password.php b/actions/password.php
index 3fd94b66ad7b486784d4d3b98e41a91f5857a4e5..fb670ecc9ea2a2bbffa938ff084b2a14b94a3c75 100644 (file)
--- a/actions/password.php
+++ b/actions/password.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 PasswordAction extends SettingsAction {
        

diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 95462133ee3fb5a5b42e7106375d83c74d95cffa..f46045dde474d5b77293678ea8cccad04c642025 100644 (file)
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.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 ProfilesettingsAction extends SettingsAction {
        

diff --git a/actions/public.php b/actions/public.php
index 8cb854fec170227a1b14cd46d2174e049b06fd24..698f991952afb2be1c652f9775cfa71cb2fbf4d1 100644 (file)
--- a/actions/public.php
+++ b/actions/public.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 PublicAction extends StreamAction {
 

diff --git a/actions/register.php b/actions/register.php
index 753c79ecb6dbde364f2b48091b3ad4dfcfc32674..80cc6aa7e271543c5706ea187aff07a90f86babd 100644 (file)
--- a/actions/register.php
+++ b/actions/register.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 RegisterAction extends Action {
        

diff --git a/actions/shownotice.php b/actions/shownotice.php
index 2e14963bb5a876410589526ca026babda781bde1..21784e4fd286c01bd045747b9734e73c23549c07 100644 (file)
--- a/actions/shownotice.php
+++ b/actions/shownotice.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 ShownoticeAction extends Action {
 
@@ -64,8 +64,8 @@ class ShownoticeAction extends Action {
                common_start_element('a', array('href' => $profile->profileurl,
                                                                                'class' => 'nickname',
                                                                                'title' => 
-                                                                               ($profile->fullname) ? $profile->fullname : 
-                                                                                                      $profile->nickname)),
+                                                                               ($profile->fullname) ? $profile->fullname :
+                                                                                                      $profile->nickname),
                                                         $profile->nickname);
                # FIXME: URL, image, video, audio
                common_element('span', array('class' => 'content'),

diff --git a/actions/showstream.php b/actions/showstream.php
index 8272e1038477c347664433533da1d742b316481f..c477ae29b7a29a64437d7ecc11ac53c48576aede 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.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('SUBSCRIPTIONS_PER_ROW', 5);
 define('SUBSCRIPTIONS', 80);
@@ -169,7 +169,7 @@ class ShowstreamAction extends StreamAction {
                }
 
                common_element('a', array('href' => common_local_url('subscriptions', 
-                                                                                                                        array('profile' => $profile->nickname))
+                                                                                                                        array('profile' => $profile->nickname)),
                                                                  'class' => 'moresubscriptions'),
                                           _t('All subscriptions'));
 

diff --git a/actions/subscribe.php b/actions/subscribe.php
index aab6c4b1557d7cd5a599d3d12b14c694a6293f88..68fdd24e98d5bca9679b7b1d9cfc81570d054d69 100644 (file)
--- a/actions/subscribe.php
+++ b/actions/subscribe.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 SubscribeAction extends Action {
        function handle($args) {

diff --git a/actions/subscribed.php b/actions/subscribed.php
index f24470f0297529e9f2ad909fa7074651aea9a32c..d28ff237d8043b3521d3b2a92b3b457cb8e3d2f7 100644 (file)
--- a/actions/subscribed.php
+++ b/actions/subscribed.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 SubscribedAction extends Action {
 

diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 87b8a4e48593415b67a42d5782dba3b7cbd6d096..60ceb0c983affe91684ec9be9f8bd7bfc39bb5ec 100644 (file)
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.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 SubscriptionsAction extends Action {
        

diff --git a/classes/Notice.php b/classes/Notice.php
index 538ae9c01b2d03afa1927aea4cf678009fa8b4c7..24c8133308fadfd2c0b1ba728266d5ac8ea066d2 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.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); }
 
 /**
  * Table Definition for notice

diff --git a/classes/Profile.php b/classes/Profile.php
index 4f756856ec1dadbfe27b23353ce1ab83544f773a..686a7916303fb3491cc9a3457589b7bda6af5625 100644 (file)
--- a/classes/Profile.php
+++ b/classes/Profile.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); }
 
 /**
  * Table Definition for profile

diff --git a/classes/Remote_profile.php b/classes/Remote_profile.php
index e9e4094b3b02e78c7bfc64047a885046b8550853..0aa727ad154629c4652813402aa0802271763b0f 100644 (file)
--- a/classes/Remote_profile.php
+++ b/classes/Remote_profile.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); }
 
 /**
  * Table Definition for remote_profile

diff --git a/classes/Subscription.php b/classes/Subscription.php
index caa0553cbabe16808d378807ad206a8b660d29af..ca2b21c025596dc1143161a1e31825699453cfbe 100644 (file)
--- a/classes/Subscription.php
+++ b/classes/Subscription.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); }
 
 /**
  * Table Definition for subscription

diff --git a/classes/User.php b/classes/User.php
index 2b8610a6520c6fd5a259743aa0e0c8d4901f5a33..945309638331ff8008db486ed7a1ba0045b94015 100644 (file)
--- a/classes/User.php
+++ b/classes/User.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); }
 /**
  * Table Definition for user
  */

diff --git a/index.php b/index.php
index 812239e3d56931ae2754cccc71bcbd08c1a2baae..9d27eef2d54da74cafdd9747946915e0f1b378b6 100644 (file)
--- a/index.php
+++ b/index.php
@@ -28,10 +28,8 @@ $actionfile = INSTALLDIR."/actions/$action.php";
 if (file_exists($actionfile)) {
        require_once($actionfile);
        $action_class = ucfirst($action) . "Action";
-       if (function_exists($action_function)) {
-       call_user_func($action_function);
+       call_user_func(array($action_class, 'handle'), $_REQUEST);
 } else {
        common_user_error(_t('Unknown action'));
 }
 
-?>
\ No newline at end of file

diff --git a/lib/action.php b/lib/action.php
index 049885acd0450589b3d663fa69172ed15bc92ef1..f8442a1f02b81c6388b753cf685e15acc56a7fb6 100644 (file)
--- 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 069541026466c178b347f56af692fcc1bcd57b3e..0d734e2b4d7b98e1edf3f76a6357be8f6db7ff7c 100644 (file)
--- 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 1795969f9082be38e000709d1386de5f8969683a..d74e226d8510cf7a6b35043bc463a8b03319dfda 100644 (file)
--- 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 6b2ab24ff03eb425fffe10700f59186023c7f644..2b8361a7351a50bbce191157d80c254bd395cdab 100644 (file)
--- 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);