stream_fini() duplication removed from Briskin5 User derivated class
authorMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Thu, 15 Nov 2012 07:08:21 +0000 (08:08 +0100)
committerMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Thu, 15 Nov 2012 07:08:21 +0000 (08:08 +0100)
web/Obj/user.phh
web/briskin5/Obj/briskin5.phh

index d094055..0f7c46c 100644 (file)
@@ -755,6 +755,8 @@ class User {
 
   public static function stream_fini($init_string, $is_unrecoverable)
 {
+    printf("xXx user::stream_fini\n");
+
     // IF IFRAME THEN:
     $body = "";
     $body .= sprintf("<html>
index 28ebe2c..6190b80 100644 (file)
@@ -720,34 +720,6 @@ class Bin5_user extends User {
         return ($ret);
     }
 
-    public static function stream_fini($init_string, $is_unrecoverable)
-{
-    printf("xXx user::stream_fini\n");
-
-    // IF IFRAME THEN:
-    $body = "";
-    $body .= sprintf("<html>
-<head>
-<script type=\"text/javascript\" src=\"%scommons.js\"></script>
-<script type=\"text/javascript\" src=\"%sxynt-streaming-ifra.js\"></script>
-<script type=\"text/javascript\">
-var xynt_streaming = \"ready\";", self::base_get(), self::base_get());
-    $body .= sprintf("
-window.onload = function () { if (xynt_streaming != \"ready\") { xynt_streaming.reload(); } };
-</script>
-</head>
-<body>");
-    $body .= sprintf("<!-- \n%s -->\n", $init_string);
-    $body .= sprintf("<script id='hs%d' type='text/javascript'><!--
-push(\"%s\");
-// -->
-</script>", 0, escpush(self::blocking_error($is_unrecoverable)) );
-    // ELSE IF XHR THEN:
-    // return (self::blocking_error($is_unrecoverable));
-    return ($body);
-}
-
-
     protected function blocking_error($is_unrecoverable)
     {
         GLOBAL $is_page_streaming;