Changeset 3971 for extensions/event_cats

Timestamp:

Oct 2, 2009, 11:26:21 PM (15 years ago)

Author:

LucMorizur

Message:

[Event Cats] Bug-free files... hopefully...

Location:

extensions/event_cats

Files:

• admin/evntcats_admin.php (modified) (3 diffs)
• include/ec_conf.inc.php (modified) (1 diff)
• include/evntcats_funcs.inc.php (modified) (1 diff)
• main.inc.php (modified) (10 diffs)
• maintain.inc.php (modified) (1 diff)

extensions/event_cats/admin/evntcats_admin.php

@@ -292 +292 @@
     case 'ec_nok' :
       if (empty($ec_entry['arg2'])) {
-        $dspl = l10n('ec_dspl_ok_acc_denied');
+        $dspl = l10n('ec_dspl_nok_acc_denied');
       }
       else {
-        $url_end = '&ap='.$arg2;
         $dspl = ($ec_ap_ok) ?
          l10n('ec_dspl_ok_ap_pre').
@@ -303 +302 @@
          l10n('ec_dspl_ok_ap_end')
         :
-         l10n('ec_dspl_ok_acc_denied')
+         l10n('ec_dspl_nok_acc_denied')
         ;
       }
@@ -310 +309 @@
     case 'ec_nok_ap_pb' : // No need to check here if Additional Pages is
     case 'ec_ok_ap_pb' :  // active : we can arrive here only when it is.
-      $url_end = '&ap='.$arg2;
       $page['errors'][] = l10n('ec_add_page_miss');
-      $dspl = ($ec_entry['action'] == 'ec_ok_ap_pb') ?
-       l10n('ec_dspl_ok_home') : l10n('ec_dspl_nok_acc_denied');
+      if ($ec_entry['action'] == 'ec_ok_ap_pb') {
+        $url_end = '&ap='.$arg2;
+        $dspl = l10n('ec_dspl_ok_home');
+      }
+      else {
+        $dspl = l10n('ec_dspl_nok_acc_denied');
+      }
       $dspl.=
        $span_err_pre.

extensions/event_cats/include/ec_conf.inc.php

@@ -104 +104 @@
   switch ($c) {
     case 'activated':
-      return $d[0];
+      return $ec_conf[0];
     break;
     case 'dup_allow':
-      return $d[1];
+      return $ec_conf[1];
     break;
     case 'unknown_code':
-      return $d[2];
+      return $ec_conf[2];
     break;
     case 'unknown_code_ap_id':
-      return $d[3];
+      return $ec_conf[3];
     break;
     default: return false;

extensions/event_cats/include/evntcats_funcs.inc.php

@@ -290 +290 @@
   // Construction of $ec_lists['user_ids'] array var
   $ec_lists['user_ids'] = array();
-  $q = pwg_query('SELECT id,username FROM '.USERS_TABLE. ' WHERE id > 3');
+  $q = pwg_query('SELECT id,username FROM '.USERS_TABLE. ' WHERE id > 2');
   while ($r = mysql_fetch_assoc($q)) {
     $ec_lists['user_ids'][$r['id']] = $r['username'];

extensions/event_cats/main.inc.php

@@ -39 +39 @@
 
 global
-  $conf, $prefixeTable, $ec_conf,
+  $conf, $prefixeTable,
   $ec_ap_ok;   // whether Additional Pages is installed and activated
 
@@ -51 +51 @@
 if (!isset($ec_lists)) {
   $ec_lists = array();
-}
-
-// $ec_conf initalization / check
-if ($t = mysql_fetch_row(pwg_query("
- SELECT `value`
- FROM `".CONFIG_TABLE."`
- WHERE `param` = 'event_cats';
-"))) {
-  $ec_conf = explode(',' , $t[0]);
-}
-else {
-  $ec_conf = array();
 }
 
@@ -93 +81 @@
   ) ? $popup_help_content.$help_content : $popup_help_content;
 }
-                                                                                     // Mettre en place l'autoid, qu'on voie si ça marche !
 
 //----------------------------------
@@ -110 +97 @@
 
 function auto_log_user() {
-  global $ec_conf, $ec_lists;
+  global $ec_lists;
 
   $ec_ap  = NULL;
@@ -116 +103 @@
   $ec_img = NULL;
 
-  if (isset($_GET['autolog']) and ($ec_conf['activated'] == 1)) {
-    if (!is_a_guest()) logout_user();
+  if (isset($_GET['autolog']) and (read_ec_conf('activated') == 1)) {
+    // if (!is_a_guest()) logout_user();
     build_ec_lists();
     foreach ($ec_lists['ec_table'] as $ec_entry) {
@@ -123 +110 @@
     }
     if ($code_exists) {
-      if (isset($_GET['ap'])) $ec_ap = $_GET['ap'];
       if (strpos($ec_entry['action'], 'ec_ok') !== false) {
         log_user($ec_entry['user_id'], false);
+        if (isset($_GET['ap'])) $ec_ap = $_GET['ap'];
         if (isset($_GET['cat'])) $ec_cat = $_GET['cat'];
         if (isset($_GET['img'])) $ec_img = $_GET['img'];
@@ -161 +148 @@
           }
         }
+        redirect(make_index_url());
+      }
+      else {
+        if (
+         $ec_entry['action'] == 'ec_nok' or
+         $ec_entry['action'] == 'ec_nok_ap_pb'
+        ) {
+          if ($ec_entry['action'] == 'ec_nok_ap_pb') access_denied();
+          $ec_ap = $ec_entry['arg2'];
+          if (array_key_exists($ec_ap, $ec_lists['add_pages'])) {
+            redirect(
+             PHPWG_ROOT_PATH.'index.php?/additional_page/'.$ec_ap);
+          }
+          access_denied();
+        }
         else {
           redirect(make_index_url());
         }
       }
-      else {
-        if ($ec_entry['action'] == 'ec_nok') {
-          if (isset($ec_ap)) {
-            if (array_key_exists($ec_ap,$ec_lists['add_pages'])) {
-              redirect(
-               PHPWG_ROOT_PATH.'index.php?/additional_page/'.$ec_ap);
-            }
-          }
-          access_denied();
-        }
-        else {
-          redirect(make_index_url());
-        }
-      }
     }
     else {
       if (
-       $ec_conf['unknown_code'] == 2 and
+       read_ec_conf('unknown_code') == 2 and
         array_key_exists(
-         $ec_conf['unknown_code_ap_id'], $ec_lists['add_pages']
+         read_ec_conf('unknown_code_ap_id'), $ec_lists['add_pages']
         )
        ) {
         redirect(
          PHPWG_ROOT_PATH.
-         'index.php?/additional_page/'.$ec_conf['unknown_code_ap_id']
+         'index.php?/additional_page/'.read_ec_conf('unknown_code_ap_id')
         );
       }
-      elseif ($ec_conf['unknown_code'] == 1 or
-       $ec_conf['unknown_code'] == 2) {
+      elseif (read_ec_conf('unknown_code') == 1 or
+       read_ec_conf('unknown_code') == 2) {
         access_denied();
       }
@@ -216 +204 @@
 
 function assign_perm_for_new_user($new_user)
-{ /*
+{
   global $user;
 
@@ -260 +248 @@
       pwg_query($query);
     }
-  }  */
+  }
 }
 
@@ -274 +262 @@
 add_event_handler('blockmanager_apply', 'duplicate_account_url');
 
-function duplicate_account_url()
-{ /*
-  global $conf, $lang, $template;
-
-  if ($conf['allow_user_registration'] and !is_admin() and !is_a_guest())
-    and !is_admin() and !is_a_guest())
-  {
+function duplicate_account_url() {
+  global $lang, $template;
+
+  if (!is_admin() and !is_a_guest()) {
     $template->assign( 'U_REGISTER', get_root_url().'register.php');
     $lang['Create a new account'] = l10n('Duplicate account');
     $lang['Register'] = l10n('Duplicate');
-  } */
-}
-
-// copying/pasting the following lines from same file in plugin LLGBO2,
-// because it looks like it's useful :-/ .....   
-               /*
-add_event_handler('render_element_content',
-  array(&$obj,'MyPictureOptions'),  EVENT_HANDLER_PRIORITY_NEUTRAL-1,  2  );   */
+  }
+}
+
 add_event_handler('get_admin_plugin_menu_links', array(&$obj, 'plugin_admin_menu') );
 set_plugin_data($plugin['id'], $obj);

extensions/event_cats/maintain.inc.php

@@ -38 +38 @@
 function plugin_uninstall() {
 
-  global $prefixeTable, $conf, $ec_conf;
+  global $prefixeTable, $ec_conf;
 
   unset($ec_conf);