[Phpgroupware-cvs] comic/inc functions.inc.php,1.20

[powerstat]

Update of comic/inc

Modified Files:
     Branch: MAIN
            functions.inc.php lines: +33 -33

Log Message:
Fixes deprecated (since 2003) call by reference functions calls. All function 
declarations were already correct.

====================================================
Index: comic/inc/functions.inc.php
diff -u comic/inc/functions.inc.php:1.19 comic/inc/functions.inc.php:1.20
--- comic/inc/functions.inc.php:1.19    Tue Jul 20 23:51:54 2004
+++ comic/inc/functions.inc.php Thu May  5 16:33:09 2005
@@ -97,7 +97,7 @@
             $fetch_url = $GLOBALS['phpgw']->db->f("data_baseurl")
                 .$GLOBALS['phpgw']->db->f("data_parseurl");
             $comic_time   = time() - 
($GLOBALS['phpgw']->db->f("data_daysold")*3600*24);
-            comic_resolver(&$fetch_url, $comic_time);
+            comic_resolver($fetch_url, $comic_time);

         }

@@ -110,11 +110,11 @@
         switch ($GLOBALS['phpgw']->db->f("data_resolve"))
         {
           case "Static":
-            $status = comic_resolve_static(&$comic_url, &$comic_day);
+            $status = comic_resolve_static($comic_url, $comic_day);
             break;
           case "Remote":
-            $status = comic_resolve_remote($remote_enabled, &$fetch_url,
-                                           &$comic_url, &$comic_day);
+            $status = comic_resolve_remote($remote_enabled, $fetch_url,
+                                           $comic_url, $comic_day);
             break;
         }
     }
@@ -183,7 +183,7 @@
     /**************************************************************************
      * rather straight forward resolve of the url
      *************************************************************************/
-    $status       = comic_resolver(&$comic_url, $comic_time);
+    $status       = comic_resolver($comic_url, $comic_time);


     return $status;
@@ -243,7 +243,7 @@
             ."[0-9]*"
             ."[g]*.(jpg|gif)";

-        comic_resolver(&$parse_expr, $comic_time);
+        comic_resolver($parse_expr, $comic_time);
         break;
       case "Creators":
         $baseurl    = "http://www.comics.com";;
@@ -266,7 +266,7 @@
             ."/{Ymd}"
             .$GLOBALS['phpgw']->db->f("data_prefix")
             ."-a.gif";
-        comic_resolver(&$parse_expr, $comic_time);
+        comic_resolver($parse_expr, $comic_time);

         $fetch_url  = $baseurl.$parseurl;

@@ -281,7 +281,7 @@
             ."/{Y}/"
             .$GLOBALS['phpgw']->db->f("data_prefix")
             ."{ymd}.gif";
-        comic_resolver(&$parseurl, $comic_time);
+        comic_resolver($parseurl, $comic_time);

         $fetch_url  = $GLOBALS['phpgw']->db->f("data_linkurl");

@@ -294,11 +294,11 @@
         $parseurl     = $GLOBALS['phpgw']->db->f("data_parseurl");
         $parse_expr   = $GLOBALS['phpgw']->db->f("data_parsexpr");

-        $status = comic_resolver(&$parseurl, $comic_time);
+        $status = comic_resolver($parseurl, $comic_time);

         if ($status == STD_SUCCESS)
         {
-            $status = comic_resolver(&$parse_expr, $comic_time);
+            $status = comic_resolver($parse_expr, $comic_time);
         }
         break;
     }
@@ -313,7 +313,7 @@
         if ($remote_enabled)
         {
             $status = comic_parser($baseurl, $fetch_url, $parse_expr,
-                                   &$comic_url);
+                                   $comic_url);
         }
         else
         {
@@ -597,11 +597,11 @@
         /**********************************************************************
          * get the admin settings
          *********************************************************************/
-        comic_admin_data(&$image_src,
-                         &$admin_censorlvl,
-                         &$censor_override,
-                         &$remote_enabled,
-                         &$filesize);
+        comic_admin_data($image_src,
+                         $admin_censorlvl,
+                         $censor_override,
+                         $remote_enabled,
+                         $filesize);

         /**********************************************************************
          * start our template
@@ -659,8 +659,8 @@
                     /**********************************************************
                      * resolve the url
                      *********************************************************/
-                    $status = comic_resolve_url($remote_enabled, &$fetch_url,
-                                                &$comic_url, &$comic_day);
+                    $status = comic_resolve_url($remote_enabled, $fetch_url,
+                                                $comic_url, $comic_day);
                 }
                 else
                 {
@@ -675,7 +675,7 @@
                  *************************************************************/
                 $link_tgt =
                     comic_resolve_linkurl($status, $fetch_url,
-                                          &$link_url, &$comment);
+                                          $link_url, $comment);

                 /**************************************************************
                  * if comic_day is not in days allowed flag error
@@ -691,7 +691,7 @@
                  *************************************************************/
                 if (($image_src == COMIC_SNARFED) && ($status == STD_SUCCESS))
                 {
-                    $status = comic_snarf(&$comic_url, $filesize);
+                    $status = comic_snarf($comic_url, $filesize);
                 }

                 /**************************************************************
@@ -721,7 +721,7 @@
                     ($status != STD_WARNING) &&
                     ($status != STD_CURRENT))
                 {
-                    comic_error($image_location, $status, &$comic_url);
+                    comic_error($image_location, $status, $comic_url);
                     $status = STD_TEMPLATE;
                 }

@@ -840,7 +840,7 @@
             = $comic_perpage;
         comic_match_bar($start, $end, $indexlimit,
                         $comics_displayed,
-                        &$matchs_c);
+                        $matchs_c);
         $GLOBALS['phpgw_info']["user"]["preferences"]["common"]["maxmatchs"]
             = $temp;
     }
@@ -851,11 +851,11 @@
     /**************************************************************************
      * get the admin settings
      *************************************************************************/
-    comic_admin_data(&$image_src,
-                     &$admin_censorlvl,
-                     &$censor_override,
-                     &$remote_enabled,
-                     &$filesize);
+    comic_admin_data($image_src,
+                     $admin_censorlvl,
+                     $censor_override,
+                     $remote_enabled,
+                     $filesize);

     /**************************************************************************
      * determine what comic to get
@@ -926,8 +926,8 @@
             /******************************************************************
              * resolve the url
              *****************************************************************/
-            $status = comic_resolve_url($remote_enabled, &$fetch_url,
-                                        &$comic_url, &$comic_day);
+            $status = comic_resolve_url($remote_enabled, $fetch_url,
+                                        $comic_url, $comic_day);
         }
         else
         {
@@ -942,7 +942,7 @@
          *********************************************************************/
         $link_tgt =
             comic_resolve_linkurl($status, $fetch_url,
-                                  &$link_url, &$comment);
+                                  $link_url, $comment);

         /**********************************************************************
          * if comic_day is not in days allowed flag error
@@ -958,7 +958,7 @@
          *********************************************************************/
         if (($image_src == COMIC_SNARFED) && ($status == STD_SUCCESS))
         {
-            $status = comic_snarf(&$comic_url, $filesize);
+            $status = comic_snarf($comic_url, $filesize);
         }

         /**********************************************************************
@@ -988,7 +988,7 @@
             ($status != STD_WARNING) &&
             ($status != STD_CURRENT))
         {
-            comic_error($image_location, $status, &$comic_url);
+            comic_error($image_location, $status, $comic_url);
             $status = STD_TEMPLATE;
         }